adium 3904:fd2f8747430a: When running a Release-Debug build, sto...
commits at adium.im
commits at adium.im
Sat May 21 12:07:02 UTC 2011
details: http://hg.adium.im/adium/rev/fd2f8747430a
revision: 3904:fd2f8747430a
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat May 21 14:04:32 2011 +0200
When running a Release-Debug build, store the profile used correctly as the normal profile instead of the debug profile.
Refs #14432
(transplanted from 355bff287503b09fdd125cc119991fce8c9973c9)
Subject: adium 3905:6c4a152a2f47: Merged
details: http://hg.adium.im/adium/rev/6c4a152a2f47
revision: 3905:6c4a152a2f47
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat May 21 14:06:48 2011 +0200
Merged
diffs (694 lines):
diff -r 09afa7a64d97 -r 6c4a152a2f47 Copyright.txt
--- a/Copyright.txt Tue May 17 00:00:31 2011 +0200
+++ b/Copyright.txt Sat May 21 14:06:48 2011 +0200
@@ -93,6 +93,7 @@
David Smith
Greg Smith
Jeff Squyres
+Patrick Steinhardt
Kent Sutherland
Shayne Sweeney
Mike Timm
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m Sat May 21 14:06:48 2011 +0200
@@ -306,12 +306,16 @@
{
// Highlight item
[self highlightItemAtIndex:[self indexAtPoint:[self convertPoint:[anEvent locationInWindow] fromView:nil]]];
+
+ [super mouseMoved:anEvent];
}
- (void)mouseExited:(NSEvent *)anEvent
{
// Reset highlight
[self resetHighlight];
+
+ [super mouseExited:anEvent];
}
- (void)scrollWheel:(NSEvent *)anEvent
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AIOutlineView.h
--- a/Frameworks/AIUtilities Framework/Source/AIOutlineView.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIOutlineView.h Sat May 21 14:06:48 2011 +0200
@@ -14,8 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "AILeopardCompatibility.h"
-
#define AIOutlineViewUserDidExpandItemNotification @"AIOutlineViewUserDidExpandItemNotification"
#define AIOutlineViewUserDidCollapseItemNotification @"AIOutlineViewUserDidCollapseItemNotification"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AISegmentedControl.m
--- a/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m Sat May 21 14:06:48 2011 +0200
@@ -17,7 +17,6 @@
#import "AISegmentedControl.h"
#import <AIUtilities/AIApplicationAdditions.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@interface NSSegmentedCell (ApplePrivate)
- (void)setMenuIndicatorShown:(BOOL)shown forSegment:(NSInteger)segment;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m
--- a/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m Sat May 21 14:06:48 2011 +0200
@@ -16,7 +16,6 @@
#import "AISharedWriterQueue.h"
#import <libkern/OSAtomic.h>
#import "AIApplicationAdditions.h"
-#import "AILeopardCompatibility.h"
@interface AISharedWriterQueue()
+ (NSOperationQueue *)queue;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m
--- a/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISmoothTooltipTracker.m Sat May 21 14:06:48 2011 +0200
@@ -19,7 +19,6 @@
#import "AISmoothTooltipTracker.h"
#import "AIDockingWindow.h"
-#import "AILeopardCompatibility.h"
#define TOOL_TIP_CHECK_INTERVAL 45.0 //Check for mouse X times a second
#define TOOL_TIP_DELAY 35.0 //Number of check intervals of no movement before a tip is displayed
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h
--- a/Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h Sat May 21 14:06:48 2011 +0200
@@ -14,8 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
-
/*!
* @protocol AIToolbarTabViewDelegate
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m
--- a/Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import "AITooltipUtilities.h"
-#import "AILeopardCompatibility.h"
#import <libkern/OSAtomic.h>
#define TOOLTIP_MAX_WIDTH 300
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AIAbstractListController.h
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.h Sat May 21 14:06:48 2011 +0200
@@ -16,7 +16,6 @@
#import <Adium/AIWindowController.h>
#import <AIUtilities/AISmoothTooltipTracker.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIAutoScrollView, AIContactList, AIListOutlineView, AIListContactCell, AIListGroupCell, ESObjectWithProperties, AIListObject, AIListContact, AIChat;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AIAccountMenu.h
--- a/Frameworks/Adium Framework/Source/AIAccountMenu.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccountMenu.h Sat May 21 14:06:48 2011 +0200
@@ -17,7 +17,6 @@
#import <Adium/AIAbstractListObjectMenu.h>
#import <Adium/AIContactObserverManager.h>
#import <Adium/AIStatusMenu.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIAccount;
@protocol AIAccountMenuDelegate;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.h
--- a/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIWindowController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
#define AUTHORIZATION_REQUESTS AILocalizedString(@"Authorization Requests", nil)
#define GET_INFO AILocalizedString(@"Get Info", nil)
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AIContactMenu.h
--- a/Frameworks/Adium Framework/Source/AIContactMenu.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIContactMenu.h Sat May 21 14:06:48 2011 +0200
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#import <Adium/AIAbstractListObjectMenu.h>
#import <Adium/AIContactObserverManager.h>
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AIEditStateWindowController.h
--- a/Frameworks/Adium Framework/Source/AIEditStateWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIEditStateWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -16,7 +16,6 @@
#import <Adium/AIWindowController.h>
#import <Adium/AIStatus.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIAccount, AITextViewWithPlaceholder, AIService, AIAutoScrollView, AISendingTextView;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AILoginControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AILoginControllerProtocol.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AILoginControllerProtocol.h Sat May 21 14:06:48 2011 +0200
@@ -20,7 +20,7 @@
#define LOGIN_SHOW_WINDOW @"Show Login Window" //Should hide the login window
#define LOGIN_LAST_USER @"Last Login Name" //Last logged in user
-#ifdef DEBUG_BUILD
+#if defined (DEBUG_BUILD) && ! defined (RELEASE_BUILD)
# define LOGIN_LAST_USER_DEBUG @"Last Login Name-Debug"//Last logged in user - debug
#endif
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/AIWindowController.h
--- a/Frameworks/Adium Framework/Source/AIWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -14,8 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import "AILeopardCompatibility.h"
-
@interface AIWindowController : NSWindowController <NSWindowDelegate> {
}
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/ESContactAlertsViewController.h
--- a/Frameworks/Adium Framework/Source/ESContactAlertsViewController.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/ESContactAlertsViewController.h Sat May 21 14:06:48 2011 +0200
@@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#define CONTACT_ALERTS_DETAILS_FOR_HEADER_CHANGED @"ContactAlertDetailsForHeaderChanged"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Frameworks/Adium Framework/Source/SS_PrefsController.h
--- a/Frameworks/Adium Framework/Source/SS_PrefsController.h Tue May 17 00:00:31 2011 +0200
+++ b/Frameworks/Adium Framework/Source/SS_PrefsController.h Sat May 21 14:06:48 2011 +0200
@@ -1,5 +1,4 @@
/* SS_PrefsController */
-#import <AIUtilities/AILeopardCompatibility.h>
@interface SS_PrefsController : NSObject <NSWindowDelegate, NSToolbarDelegate>
{
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Dual Window Interface/AIMessageWindowController.h
--- a/Plugins/Dual Window Interface/AIMessageWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIWindowController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
#define AIMessageWindow_ControllersChanged @"AIMessageWindow_ControllersChanged"
#define AIMessageWindow_ControllerOrderChanged @"AIMessageWindow_ControllerOrderChanged"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Emoticons/AIEmoticonPreferences.h
--- a/Plugins/Emoticons/AIEmoticonPreferences.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Emoticons/AIEmoticonPreferences.h Sat May 21 14:06:48 2011 +0200
@@ -17,7 +17,6 @@
#import <AIUtilities/AIFileManagerAdditions.h>
#import <AIUtilities/AIParagraphStyleAdditions.h>
#import <Adium/AIWindowController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIEmoticonPack;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Image Uploading Plugin/AIImageShackImageUploader.h
--- a/Plugins/Image Uploading Plugin/AIImageShackImageUploader.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Image Uploading Plugin/AIImageShackImageUploader.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import "AIGenericMultipartImageUploader.h"
-#import <AIUtilities/AILeopardCompatibility.h>
@interface AIImageShackImageUploader : AIGenericMultipartImageUploader <NSXMLParserDelegate> {
NSData *resultData;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.h
--- a/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.h Sat May 21 14:06:48 2011 +0200
@@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#define PREF_KEY_DEFAULT_IMAGE_UPLOADER @"Default Image Uploader"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Link Management/SHAutoValidatingTextView.h
--- a/Plugins/Link Management/SHAutoValidatingTextView.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Link Management/SHAutoValidatingTextView.h Sat May 21 14:06:48 2011 +0200
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#import <AutoHyperlinks/AutoHyperlinks.h>
@interface SHAutoValidatingTextView : NSTextView <NSTextViewDelegate>{
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Purple Service/AIPurpleAIMAccountViewController.h
--- a/Plugins/Purple Service/AIPurpleAIMAccountViewController.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Purple Service/AIPurpleAIMAccountViewController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import "AIPurpleOscarAccountViewController.h"
-#import <AIUtilities/AILeopardCompatibility.h>
@interface AIPurpleAIMAccountViewController : AIPurpleOscarAccountViewController {
IBOutlet NSTextView <NSWindowDelegate> *textView_textProfile;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterXMLParser.h
--- a/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterXMLParser.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/Twitter Plugin/MGTwitterEngine/MGTwitterXMLParser.h Sat May 21 14:06:48 2011 +0200
@@ -8,7 +8,6 @@
#import "MGTwitterEngineGlobalHeader.h"
#import "MGTwitterParserDelegate.h"
-#import <AIUtilities/AILeopardCompatibility.h>
@interface MGTwitterXMLParser : NSObject <NSXMLParserDelegate> {
__weak NSObject <MGTwitterParserDelegate> *delegate; // weak ref
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/WebKit Message View/AIWebKitDelegate.h
--- a/Plugins/WebKit Message View/AIWebKitDelegate.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/WebKit Message View/AIWebKitDelegate.h Sat May 21 14:06:48 2011 +0200
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#import <WebKit/WebKit.h>
@class ESWebView;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/WebKit Message View/AIWebKitMessageViewController.h
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.h Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.h Sat May 21 14:06:48 2011 +0200
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#import <Adium/AIInterfaceControllerProtocol.h>
@class AIWebKitMessageViewPlugin, AIWebkitMessageViewStyle, AIContentObject, ESWebView, DOMDocument, DOMRange, AIMetaContact, AIChat, AIContentObject, AIWebKitDelegate;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/WebKit Message View/de.lproj/WebKitPreferencesView.nib/designable.nib
--- a/Plugins/WebKit Message View/de.lproj/WebKitPreferencesView.nib/designable.nib Tue May 17 00:00:31 2011 +0200
+++ b/Plugins/WebKit Message View/de.lproj/WebKitPreferencesView.nib/designable.nib Sat May 21 14:06:48 2011 +0200
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
+ <string key="IBDocument.SystemVersion">10J869</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">823</string>
@@ -340,7 +340,7 @@
<object class="NSButton" id="437785535">
<reference key="NSNextResponder" ref="906020110"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{152, 234}, {124, 18}}</string>
+ <string key="NSFrame">{{152, 234}, {163, 18}}</string>
<reference key="NSSuperview" ref="906020110"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="287125431">
@@ -362,7 +362,7 @@
<object class="NSButton" id="937091963">
<reference key="NSNextResponder" ref="906020110"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{152, 212}, {103, 18}}</string>
+ <string key="NSFrame">{{152, 212}, {142, 18}}</string>
<reference key="NSSuperview" ref="906020110"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="848198898">
diff -r 09afa7a64d97 -r 6c4a152a2f47 Plugins/WebKit Message View/de.lproj/WebKitPreferencesView.nib/keyedobjects.nib
Binary file Plugins/WebKit Message View/de.lproj/WebKitPreferencesView.nib/keyedobjects.nib has changed
diff -r 09afa7a64d97 -r 6c4a152a2f47 Resources/de.lproj/Localizable.strings
Binary file Resources/de.lproj/Localizable.strings has changed
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIAdvancedPreferences.h
--- a/Source/AIAdvancedPreferences.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIAdvancedPreferences.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIPreferencePane.h>
-#import "AILeopardCompatibility.h"
@class KNShelfSplitView, AIModularPaneCategoryView;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIAppearancePreferences.h
--- a/Source/AIAppearancePreferences.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIAppearancePreferences.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIPreferencePane.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@interface AIAppearancePreferences : AIPreferencePane <NSMenuDelegate> {
IBOutlet NSPopUpButton *popUp_statusIcons;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIChatLog.h
--- a/Source/AIChatLog.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIChatLog.h Sat May 21 14:06:48 2011 +0200
@@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#define ChatLog_WillDelete @"ChatLog_WillDelete"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIContactInfoContentController.m
--- a/Source/AIContactInfoContentController.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIContactInfoContentController.m Sat May 21 14:06:48 2011 +0200
@@ -66,7 +66,7 @@
-(void)loadContentPanes:(NSArray *)contentPanes
{
NSMutableArray *contentArray = [NSMutableArray array];
- //Allocate and initalize each class, then stick it in the array.
+ //Allocate and initialize each class, then stick it in the array.
id currentPane = nil;
for(currentPane in contentPanes) {
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIContactListNameButton.h
--- a/Source/AIContactListNameButton.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIContactListNameButton.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import "AIHoveringPopUpButton.h"
-#import <AIUtilities/AILeopardCompatibility.h>
@interface AIContactListNameButton : AIHoveringPopUpButton <NSTextFieldDelegate> {
NSTextField *textField_editor;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIContactListUserPictureMenuController.m
--- a/Source/AIContactListUserPictureMenuController.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIContactListUserPictureMenuController.m Sat May 21 14:06:48 2011 +0200
@@ -43,9 +43,6 @@
- (void)choosePicture:(id)sender;
- (void)clearRecentPictures:(id)sender;
-// Notifications
-- (void)parentWindowWillClose:(NSNotification *)aNotification;
-
@end
@@ -106,11 +103,6 @@
}
[self setImages:pictures];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(parentWindowWillClose:)
- name:NSWindowWillCloseNotification
- object:[picker window]];
[menu popUpMenuPositioningItem:[menu itemAtIndex:0] atLocation:NSMakePoint(2.0f, -4.0f) inView:imagePicker];
}
@@ -162,8 +154,7 @@
return [array autorelease];
}
-#pragma mark -
-#pragma mark NSMenu delegate
+#pragma mark - NSMenu delegate
- (void)menuNeedsUpdate:(NSMenu *)aMenu
{
@@ -247,13 +238,7 @@
[menuItem release];
}
-- (void)menuDidClose:(NSMenu *)aMenu
-{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark -
-#pragma mark AIImageCollectionView delegate
+#pragma mark - AIImageCollectionView delegate
- (BOOL)imageCollectionView:(AIImageCollectionView *)collectionView shouldHighlightItemAtIndex:(NSUInteger)anIndex
{
@@ -291,8 +276,7 @@
[menu cancelTracking];
}
-#pragma mark -
-#pragma mark Menu Actions
+#pragma mark - Menu Actions
- (void)selectedAccount:(id)sender
{
@@ -314,23 +298,4 @@
[[IKPictureTakerRecentPictureRepository recentRepository] clearRecents:YES];
}
-#pragma mark -
-#pragma mark Parent Window Notifications
-
-- (void)windowDidResignMain:(NSNotification *)aNotification
-{
- [menu cancelTracking];
-}
-
-- (void)windowDidResignKey:(NSNotification *)aNotification
-{
- [menu cancelTracking];
-}
-
-- (void)parentWindowWillClose:(NSNotification *)aNotification
-{
- //Close menu, when our parent window closes
- [menu cancelTracking];
-}
-
@end
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIListWindowController.h
--- a/Source/AIListWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIListWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -28,7 +28,6 @@
#import "AIAnimatingListOutlineView.h"
#import <AIUtilities/AIRolloverButton.h>
#import "AIFilterBarView.h"
-#import <AIUtilities/AILeopardCompatibility.h>
typedef enum {
AIContactListWindowHidingStyleNone = 0,
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIListWindowController.m Sat May 21 14:06:48 2011 +0200
@@ -36,7 +36,6 @@
#import <Adium/AIUserIcons.h>
#import <AIUtilities/AIDockingWindow.h>
#import <AIUtilities/AIEventAdditions.h>
-#import <AIUtilities/AILeopardCompatibility.h>
#import <Adium/AIContactList.h>
#import <Adium/AIContactHidingController.h>
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AILogViewerWindowController.h
--- a/Source/AILogViewerWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AILogViewerWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -16,7 +16,6 @@
#import <Adium/AIWindowController.h>
#import <AIUtilities/AIDividedAlternatingRowOutlineView.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIChatLog, AILoggerPlugin;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/AILoggerPlugin.m Sat May 21 14:06:48 2011 +0200
@@ -51,7 +51,6 @@
#import <AIUtilities/NSCalendarDate+ISO8601Parsing.h>
#import <AIUtilities/AIApplicationAdditions.h>
-#import <AIUtilities/AILeopardCompatibility.h>
#import <libkern/OSAtomic.h>
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AILoginWindowController.h
--- a/Source/AILoginWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AILoginWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIWindowController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AILoginController;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AILoginWindowController.m
--- a/Source/AILoginWindowController.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/AILoginWindowController.m Sat May 21 14:06:48 2011 +0200
@@ -115,7 +115,7 @@
[loginDict setObject:[NSNumber numberWithBool:[checkbox_displayOnStartup state]] forKey:LOGIN_SHOW_WINDOW];
//Save the login they used
-#ifdef DEBUG_BUILD
+#if defined (DEBUG_BUILD) && ! defined (RELEASE_BUILD)
[loginDict setObject:selectedUserName forKey:LOGIN_LAST_USER_DEBUG];
#else
[loginDict setObject:selectedUserName forKey:LOGIN_LAST_USER];
@@ -253,7 +253,7 @@
#endif
//Select the login they used last
-#if DEBUG_BUILD
+#if defined (DEBUG_BUILD) && ! defined (RELEASE_BUILD)
lastLogin = [loginDict objectForKey:LOGIN_LAST_USER_DEBUG];
#else
lastLogin = [loginDict objectForKey:LOGIN_LAST_USER];
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIMenuController.h
--- a/Source/AIMenuController.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIMenuController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIMenuControllerProtocol.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIListObject, AIChat;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIURLShortenerPlugin.h
--- a/Source/AIURLShortenerPlugin.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIURLShortenerPlugin.h Sat May 21 14:06:48 2011 +0200
@@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#define KEY_SHORTENER_PREFERENCE @"Shortener Service Preference"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AIXtrasManager.h
--- a/Source/AIXtrasManager.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AIXtrasManager.h Sat May 21 14:06:48 2011 +0200
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import "AIXtraPreviewController.h"
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIXtraInfo;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/AdiumPasswords.m Sat May 21 14:06:48 2011 +0200
@@ -26,7 +26,6 @@
#import <libkern/OSAtomic.h>
#import <AIUtilities/AIApplicationAdditions.h>
-#import <AIUtilities/AILeopardCompatibility.h>
#import "AISpecialPasswordPromptController.h"
#import "ESAccountPasswordPromptController.h"
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AdiumSetupWizard.h
--- a/Source/AdiumSetupWizard.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AdiumSetupWizard.h Sat May 21 14:06:48 2011 +0200
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
#import <Adium/AIWindowController.h>
@class SetupWizardBackgroundView;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/AdiumSpeech.h
--- a/Source/AdiumSpeech.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/AdiumSpeech.h Sat May 21 14:06:48 2011 +0200
@@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <AIUtilities/AILeopardCompatibility.h>
@interface AdiumSpeech : NSObject <NSSpeechSynthesizerDelegate> {
NSMutableArray *speechArray;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/BGEmoticonMenuPlugin.h
--- a/Source/BGEmoticonMenuPlugin.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/BGEmoticonMenuPlugin.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import "AIEmoticonPack.h"
-#import <AIUtilities/AILeopardCompatibility.h>
@interface BGEmoticonMenuPlugin : AIPlugin <NSMenuDelegate>
{
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/ESFileTransferProgressWindowController.h
--- a/Source/ESFileTransferProgressWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/ESFileTransferProgressWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIWindowController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class ESFileTransfer, ESFileTransferProgressRow, AIVariableHeightOutlineView;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/ESPersonalPreferences.h
--- a/Source/ESPersonalPreferences.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/ESPersonalPreferences.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIPreferencePane.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AIImageViewWithImagePicker, AIDelayedTextField;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/ESStatusSort.h
--- a/Source/ESStatusSort.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/ESStatusSort.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AISortController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AILocalizationTextField;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/ESUserIconHandlingPlugin.h
--- a/Source/ESUserIconHandlingPlugin.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/ESUserIconHandlingPlugin.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIContactControllerProtocol.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@interface ESUserIconHandlingPlugin : AIPlugin <NSMenuDelegate> {
NSMutableSet *toolbarItems;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/OWABSearchWindowController.h
--- a/Source/OWABSearchWindowController.h Tue May 17 00:00:31 2011 +0200
+++ b/Source/OWABSearchWindowController.h Sat May 21 14:06:48 2011 +0200
@@ -15,7 +15,6 @@
*/
#import <Adium/AIWindowController.h>
-#import <AIUtilities/AILeopardCompatibility.h>
@class AILocalizationButton, ABPeoplePickerView, AIService, ABPerson, AIImageViewWithImagePicker;
diff -r 09afa7a64d97 -r 6c4a152a2f47 Source/OWSpellingPerContactPlugin.m
--- a/Source/OWSpellingPerContactPlugin.m Tue May 17 00:00:31 2011 +0200
+++ b/Source/OWSpellingPerContactPlugin.m Sat May 21 14:06:48 2011 +0200
@@ -19,7 +19,6 @@
#import <Adium/AIListContact.h>
#import <AIUtilities/AIApplicationAdditions.h>
-#import <AIUtilities/AILeopardCompatibility.h>
#define GROUP_LAST_USED_SPELLING @"Last Used Spelling"
#define KEY_LAST_USED_SPELLING @"Last Used Spelling Languge"
More information about the commits
mailing list