adium 4021:f5412548f2f3: Resolved several dozen warnings
commits at adium.im
commits at adium.im
Sun Jun 26 15:13:29 UTC 2011
details: http://hg.adium.im/adium/rev/f5412548f2f3
revision: 4021:f5412548f2f3
branch: (none)
author: Evan Schoenberg
date: Sun Jun 26 10:13:19 2011 -0500
Resolved several dozen warnings
diffs (truncated from 9870 to 1000 lines):
diff -r c9f8919114a4 -r f5412548f2f3 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sat Jun 25 16:31:14 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj Sun Jun 26 10:13:19 2011 -0500
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -153,7 +153,6 @@
117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */; };
117D6DC00BC5F0C40080D02B /* notify.png in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* notify.png */; };
1181976810D0B0D2003E8ECA /* adiumPurpleMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = 113E06A910D0ABA0005D5B9A /* adiumPurpleMedia.m */; };
- 1181981310D0B17C003E8ECA /* adiumPurpleMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 1181981210D0B17C003E8ECA /* adiumPurpleMedia.h */; };
118199C610D0B65A003E8ECA /* AIMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 118199C410D0B65A003E8ECA /* AIMedia.h */; settings = {ATTRIBUTES = (Public, ); }; };
118199C710D0B65A003E8ECA /* AIMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = 118199C510D0B65A003E8ECA /* AIMedia.m */; };
11819A0410D0B8BE003E8ECA /* AIMediaController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11819A0310D0B8BE003E8ECA /* AIMediaController.m */; };
@@ -851,7 +850,6 @@
34DC8A750A7EEEF7003E1636 /* AIEditStateWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B588C9B07AC23B2001832A9 /* AIEditStateWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A760A7EEEF7003E1636 /* AIEditStateWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B588C9C07AC23B2001832A9 /* AIEditStateWindowController.m */; };
34DC8A770A7EEEF7003E1636 /* EditStateSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 342114B40826D37100A3B0FB /* EditStateSheet.nib */; };
- 34DC8A780A7EEEF7003E1636 /* AIStatusDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AA366A095CE124003B56DB /* AIStatusDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A790A7EEEF7003E1636 /* AIAbstractListObjectMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B22E15C085CAE2E001864DE /* AIAbstractListObjectMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A7A0A7EEEF7003E1636 /* AIAbstractListObjectMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B22E15D085CAE2F001864DE /* AIAbstractListObjectMenu.m */; };
34DC8A7B0A7EEEF7003E1636 /* AIAccountMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 3449485B08E9FCD60054FF57 /* AIAccountMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1343,7 +1341,6 @@
633400BA0F9C14C2003C77A9 /* AIViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFEF0F9C14C1003C77A9 /* AIViewAdditions.m */; };
633400BB0F9C14C2003C77A9 /* AIWindowAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF00F9C14C1003C77A9 /* AIWindowAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400BC0F9C14C2003C77A9 /* AIWindowAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF10F9C14C1003C77A9 /* AIWindowAdditions.m */; };
- 633400BE0F9C14C2003C77A9 /* AIFontAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF30F9C14C1003C77A9 /* AIFontAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400BF0F9C14C2003C77A9 /* OWAddressBookAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF40F9C14C1003C77A9 /* OWAddressBookAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400C00F9C14C2003C77A9 /* OWAddressBookAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF50F9C14C1003C77A9 /* OWAddressBookAdditions.m */; };
633400C10F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF60F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -4511,7 +4508,7 @@
638BC1FB0FC932E000CE7600 /* AIObjectDebug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIObjectDebug.m; path = Source/AIObjectDebug.m; sourceTree = "<group>"; };
639DFB440F981C7C003C9A32 /* NSCalendarDate+ISO8601Parsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSCalendarDate+ISO8601Parsing.h"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.h"; sourceTree = "<group>"; };
63A3A9670F9C35D3006C9CB0 /* AIUtilities_Framework.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AIUtilities_Framework.plist; sourceTree = "<group>"; };
- 63A3A9690F9C35D3006C9CB0 /* ca */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
+ 63A3A9690F9C35D3006C9CB0 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
63A3A96A0F9C35D3006C9CB0 /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
63A3A96B0F9C35D3006C9CB0 /* da */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
63A3A96C0F9C35D3006C9CB0 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -9101,7 +9098,6 @@
345D68A80F1FD5AA002F2D01 /* PurpleFacebookAccount.h in Headers */,
34064D110F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h in Headers */,
113E06AF10D0ABE3005D5B9A /* adiumPurpleMedia.h in Headers */,
- 1181981310D0B17C003E8ECA /* adiumPurpleMedia.h in Headers */,
34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */,
34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */,
34D8154013B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h in Headers */,
@@ -9155,7 +9151,6 @@
34DC8A710A7EEEF7003E1636 /* AIStatus.h in Headers */,
34DC8A730A7EEEF7003E1636 /* AIStatusGroup.h in Headers */,
34DC8A750A7EEEF7003E1636 /* AIEditStateWindowController.h in Headers */,
- 34DC8A780A7EEEF7003E1636 /* AIStatusDefines.h in Headers */,
34DC8A790A7EEEF7003E1636 /* AIAbstractListObjectMenu.h in Headers */,
34DC8A7B0A7EEEF7003E1636 /* AIAccountMenu.h in Headers */,
34DC8A7D0A7EEEF7003E1636 /* AIContactMenu.h in Headers */,
@@ -9330,7 +9325,6 @@
633400B70F9C14C2003C77A9 /* AIURLAdditions.h in Headers */,
633400B90F9C14C2003C77A9 /* AIViewAdditions.h in Headers */,
633400BB0F9C14C2003C77A9 /* AIWindowAdditions.h in Headers */,
- 633400BE0F9C14C2003C77A9 /* AIFontAdditions.h in Headers */,
633400BF0F9C14C2003C77A9 /* OWAddressBookAdditions.h in Headers */,
633400C10F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.h in Headers */,
633400C30F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.h in Headers */,
@@ -9502,9 +9496,10 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
+ LastUpgradeCheck = 0420;
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -12613,7 +12608,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
- "\"$(SRCROOT)/Frameworks/json-framework/build/Debug\"",
"\"$(SRCROOT)/build/Debug\"",
);
};
@@ -12626,7 +12620,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
- "\"$(SRCROOT)/Frameworks/json-framework/build/Debug\"",
"\"$(SRCROOT)/build/Debug\"",
);
GCC_PREPROCESSOR_DEFINITIONS = RELEASE_BUILD;
@@ -12640,7 +12633,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
- "\"$(SRCROOT)/Frameworks/json-framework/build/Debug\"",
"\"$(SRCROOT)/build/Debug\"",
);
GCC_PREPROCESSOR_DEFINITIONS = (
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.h
--- a/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.h Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.h Sun Jun 26 10:13:19 2011 -0500
@@ -18,8 +18,8 @@
@class AIListObject;
@interface AIAbstractListObjectMenu : NSObject {
- NSMutableArray *menuItems;
- NSMenu *menu;
+ NSArray *menuItems;
+ NSMenu *menu;
}
- (NSArray *)menuItems;
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIContactAlertsControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIContactAlertsControllerProtocol.h Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIContactAlertsControllerProtocol.h Sun Jun 26 10:13:19 2011 -0500
@@ -16,7 +16,7 @@
#import <Adium/AIControllerProtocol.h>
- at class AIListObject, AIChat, AIModularPane;
+ at class AIListObject, AIChat, AIActionDetailsPane;
@protocol AIEventHandler, AIActionHandler;
@@ -382,9 +382,9 @@
/*!
* @brief Details pane
- * @result An <tt>AIModularPane</tt> to use for configuring this action, or nil if no configuration is possible.
+ * @result An <tt>AIActionDetailsPane</tt> to use for configuring this action, or nil if no configuration is possible.
*/
-- (AIModularPane *)detailsPaneForActionID:(NSString *)actionID;
+- (AIActionDetailsPane *)detailsPaneForActionID:(NSString *)actionID;
/*!
* @brief Perform an action
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIHTMLDecoder.m
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sun Jun 26 10:13:19 2011 -0500
@@ -70,7 +70,7 @@
+ (void)initialize
{
//Set up the horizontal rule which will be searched-for when encoding and inserted when decoding
- if ((self == [AIHTMLDecoder class])) {
+ if (self == [AIHTMLDecoder class]) {
#define HORIZONTAL_BAR 0x2013
#define HORIZONTAL_RULE_LENGTH 12
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIMedia.m
--- a/Frameworks/Adium Framework/Source/AIMedia.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIMedia.m Sun Jun 26 10:13:19 2011 -0500
@@ -35,7 +35,7 @@
@synthesize listContact, mediaType, mediaState, account, protocolInfo, sendProgress, receiveProgress;
- (id)initWithContact:(AIListContact *)inListContact
- onAccount:(AIAccount *)inAccount
+ onAccount:(AIAccount<AIAccount_Media> *)inAccount
{
if ((self = [super init])) {
self.account = inAccount;
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIStatusGroup.h
--- a/Frameworks/Adium Framework/Source/AIStatusGroup.h Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIStatusGroup.h Sun Jun 26 10:13:19 2011 -0500
@@ -21,7 +21,7 @@
@interface AIStatusGroup : AIStatusItem {
NSMutableArray *containedStatusItems;
NSMutableSet *_flatStatusSet;
- NSMutableArray *_sortedContainedStatusItems;
+ NSArray *_sortedContainedStatusItems;
int delaySavingAndNotification;
}
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIStatusMenu.m
--- a/Frameworks/Adium Framework/Source/AIStatusMenu.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIStatusMenu.m Sun Jun 26 10:13:19 2011 -0500
@@ -177,7 +177,7 @@
while ((statusState = [enumerator nextObject])) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
AIStatusType thisStatusType = statusState.statusType;
- AIStatusType thisStatusMutabilityType = [statusState mutabilityType];
+ AIStatusMutabilityType thisStatusMutabilityType = [statusState mutabilityType];
if ((currentStatusMutabilityType != AISecondaryLockedStatusState) &&
(thisStatusMutabilityType == AISecondaryLockedStatusState)) {
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/AIXtraInfo.m
--- a/Frameworks/Adium Framework/Source/AIXtraInfo.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIXtraInfo.m Sun Jun 26 10:13:19 2011 -0500
@@ -16,6 +16,7 @@
#import "AIXtraInfo.h"
#import <Adium/AIDockControllerProtocol.h>
+#import "AIIconState.h"
@implementation AIXtraInfo
@@ -83,7 +84,8 @@
readMePath = [[[NSBundle mainBundle] pathForResource:@"DefaultXtraReadme" ofType:@"rtf"] retain];
if (!icon) {
if ([[path pathExtension] caseInsensitiveCompare:@"AdiumIcon"] == NSOrderedSame) {
- icon = [[[adium.dockController previewStateForIconPackAtPath:path] image] retain];
+ AIIconState *previewState = [adium.dockController previewStateForIconPackAtPath:path];
+ icon = [[previewState image] retain];
} else {
icon = [[[NSWorkspace sharedWorkspace] iconForFileType:[path pathExtension]] retain];
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/Adium Framework/Source/ESFileTransfer.m
--- a/Frameworks/Adium Framework/Source/ESFileTransfer.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/ESFileTransfer.m Sun Jun 26 10:13:19 2011 -0500
@@ -109,7 +109,7 @@
- (AIAccount<AIAccount_Files> *)account
{
- return self.chat.account;
+ return (AIAccount<AIAccount_Files> *)self.chat.account;
}
- (void)setRemoteFilename:(NSString *)inRemoteFilename
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Sun Jun 26 10:13:19 2011 -0500
@@ -398,10 +398,15 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
+ LastUpgradeCheck = 0420;
};
buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 0867D691FE84028FC02AAC07 /* AIHyperlinks.framework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@@ -529,7 +534,6 @@
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_FRAMEWORKS_DIR)\"";
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/UnitTests/AutoHyperlinks.framework_Test_Prefix.pch";
@@ -542,7 +546,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = AHStressTester;
};
name = Debug;
@@ -556,7 +559,6 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_FRAMEWORKS_DIR)\"";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/UnitTests/AutoHyperlinks.framework_Test_Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "TEST_URIS_FILE_PATHNAME=\"\\\"$(SRCROOT)/TestURIs.txt\\\"\"";
@@ -569,7 +571,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = AHStressTester;
};
name = Release;
@@ -582,7 +583,6 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_FRAMEWORKS_DIR)\"";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/UnitTests/AutoHyperlinks.framework_Test_Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "TEST_URIS_FILE_PATHNAME=\"\\\"$(SRCROOT)/TestURIs.txt\\\"\"";
@@ -594,7 +594,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = AHStressTester;
};
name = "Release-Debug";
@@ -607,14 +606,12 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = AutoHyperlinks.framework_Prefix.pch;
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
MACH_O_TYPE = mh_dylib;
- PREBINDING = NO;
PRODUCT_NAME = AutoHyperlinks;
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wall";
@@ -636,7 +633,6 @@
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -650,7 +646,6 @@
"-framework",
SenTestingKit,
);
- PREBINDING = NO;
PRODUCT_NAME = Test;
WRAPPER_EXTENSION = octest;
};
@@ -663,7 +658,6 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = UnitTests/AutoHyperlinks.framework_Test_Prefix.pch;
@@ -676,7 +670,6 @@
"-framework",
SenTestingKit,
);
- PREBINDING = NO;
PRODUCT_NAME = Test;
WRAPPER_EXTENSION = octest;
};
@@ -687,7 +680,6 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = UnitTests/AutoHyperlinks.framework_Test_Prefix.pch;
@@ -700,7 +692,6 @@
"-framework",
SenTestingKit,
);
- PREBINDING = NO;
PRODUCT_NAME = Test;
WRAPPER_EXTENSION = octest;
};
@@ -711,7 +702,6 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = LinkDriver/LinkDriver.pch;
@@ -723,7 +713,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = LinkDriver;
WRAPPER_EXTENSION = app;
};
@@ -733,7 +722,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INFOPLIST_FILE = "LinkDriver/LinkDriver-Info.plist";
@@ -744,7 +732,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = LinkDriver;
WRAPPER_EXTENSION = app;
};
@@ -753,7 +740,6 @@
7EB550160DDC80DB000DC0D6 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INFOPLIST_FILE = "LinkDriver/LinkDriver-Info.plist";
@@ -764,7 +750,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = LinkDriver;
WRAPPER_EXTENSION = app;
};
@@ -780,7 +765,6 @@
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_FRAMEWORKS_DIR)\"";
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/UnitTests/AutoHyperlinks.framework_Test_Prefix.pch";
@@ -793,7 +777,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = AHThreadedStressTester;
};
name = Debug;
@@ -807,7 +790,6 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_FRAMEWORKS_DIR)\"";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/UnitTests/AutoHyperlinks.framework_Test_Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "TEST_URIS_FILE_PATHNAME=\"\\\"$(SRCROOT)/TestURIs.txt\\\"\"";
@@ -820,7 +802,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = AHThreadedStressTester;
};
name = Release;
@@ -833,7 +814,6 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_FRAMEWORKS_DIR)\"";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/UnitTests/AutoHyperlinks.framework_Test_Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "TEST_URIS_FILE_PATHNAME=\"\\\"$(SRCROOT)/TestURIs.txt\\\"\"";
@@ -845,7 +825,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = AHThreadedStressTester;
};
name = "Release-Debug";
@@ -865,7 +844,6 @@
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
MACH_O_TYPE = mh_dylib;
- PREBINDING = NO;
PRODUCT_NAME = AutoHyperlinks;
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wall";
@@ -881,14 +859,12 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = AutoHyperlinks.framework_Prefix.pch;
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
MACH_O_TYPE = mh_dylib;
- PREBINDING = NO;
PRODUCT_NAME = AutoHyperlinks;
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = YES;
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj
--- a/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Sun Jun 26 10:13:19 2011 -0500
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -319,9 +319,10 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = NO;
+ LastUpgradeCheck = 0420;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "FriBidi" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -397,7 +398,7 @@
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = framework;
};
@@ -416,7 +417,7 @@
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = Release;
@@ -429,7 +430,7 @@
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
GCC_VERSION = 4.2;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
SYMROOT = ../../build;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
};
@@ -448,7 +449,7 @@
GCC_VERSION = 4.2;
INFOPLIST_OUTPUT_FORMAT = binary;
PLIST_FILE_OUTPUT_FORMAT = binary;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
SYMROOT = ../../build;
};
name = Release;
@@ -466,7 +467,7 @@
GCC_VERSION = 4.2;
INFOPLIST_OUTPUT_FORMAT = binary;
PLIST_FILE_OUTPUT_FORMAT = binary;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
SYMROOT = ../../build;
};
name = "Release-Debug";
@@ -484,7 +485,7 @@
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
WRAPPER_EXTENSION = framework;
};
name = "Release-Debug";
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/FriBidi Framework/fribidi-0.10.7/fribidi_char_sets.c
--- a/Frameworks/FriBidi Framework/fribidi-0.10.7/fribidi_char_sets.c Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/FriBidi Framework/fribidi-0.10.7/fribidi_char_sets.c Sun Jun 26 10:13:19 2011 -0500
@@ -25,6 +25,7 @@
#ifndef FRIBIDI_NO_CHARSETS
#include "fribidi_char_sets.h"
+#include <ctype.h>
typedef struct
{
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/JSONKit/JSONKit.m
--- a/Frameworks/JSONKit/JSONKit.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/JSONKit/JSONKit.m Sun Jun 26 10:13:19 2011 -0500
@@ -852,7 +852,7 @@
break;
case JSONStringStateEscapedNeedEscapeForSurrogate:
- if((currentChar == '\\')) { stringState = JSONStringStateEscapedNeedEscapedUForSurrogate; }
+ if(currentChar == '\\') { stringState = JSONStringStateEscapedNeedEscapedUForSurrogate; }
//else { stringState = JSONStringStateParsing; atStringCharacter--; if(jk_string_add_unicodeCodePoint(parseState, UNI_REPLACEMENT_CHAR, &tokenBufferIdx, &stringHash)) { /* XXX Add error message */ stringState = JSONStringStateError; goto finishedParsing; } }
else { jk_error(parseState, @"Required a second \\u Unicode escape sequence following a surrogate \\u Unicode escape sequence."); stringState = JSONStringStateError; goto finishedParsing; }
break;
diff -r c9f8919114a4 -r f5412548f2f3 Frameworks/ShortcutRecorder/Source/SRRecorderCell.h
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderCell.h Sat Jun 25 16:31:14 2011 -0500
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderCell.h Sun Jun 26 10:13:19 2011 -0500
@@ -25,7 +25,7 @@
#define SRAnimationOffsetRect(X,Y) (SRAnimationAxisIsY ? NSOffsetRect(X,0.0f,-NSHeight(Y)) : NSOffsetRect(X,NSWidth(Y),0.0f))
- at class SRRecorderControl, CTGradient, SRValidator;
+ at class SRRecorderControl, SRValidator;
enum SRRecorderStyle {
SRGradientBorderStyle = 0,
@@ -35,7 +35,7 @@
@interface SRRecorderCell : NSActionCell <NSCoding>
{
- CTGradient *recordingGradient;
+ NSGradient *recordingGradient;
NSString *autosaveName;
BOOL isRecording;
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Sun Jun 26 10:13:19 2011 -0500
@@ -206,7 +206,7 @@
- (AWEzvRendezvousData *)initWithDictionary:(NSDictionary *)dictionary
{
if ((self = [super init])) {
- keys = [dictionary retain];
+ keys = [dictionary mutableCopy];
serial++;
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Do Nothing Contact Alert/AIDoNothingContactAlertPlugin.m
--- a/Plugins/Do Nothing Contact Alert/AIDoNothingContactAlertPlugin.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Do Nothing Contact Alert/AIDoNothingContactAlertPlugin.m Sun Jun 26 10:13:19 2011 -0500
@@ -42,7 +42,7 @@
return [NSImage imageNamed:@"Stop sign" forClass:[self class]];
}
-- (AIModularPane *)detailsPaneForActionID:(NSString *)actionID
+- (AIActionDetailsPane *)detailsPaneForActionID:(NSString *)actionID
{
return nil;
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Dock Icon Badging/AIDockNameOverlay.m
--- a/Plugins/Dock Icon Badging/AIDockNameOverlay.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Dock Icon Badging/AIDockNameOverlay.m Sun Jun 26 10:13:19 2011 -0500
@@ -97,9 +97,9 @@
/*!
* @brief Details pane
- * @result An <tt>AIModularPane</tt> to use for configuring this action, or nil if no configuration is possible.
+ * @result An <tt>AIActionDetailsPane</tt> to use for configuring this action, or nil if no configuration is possible.
*/
-- (AIModularPane *)detailsPaneForActionID:(NSString *)actionID
+- (AIActionDetailsPane *)detailsPaneForActionID:(NSString *)actionID
{
return nil;
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.m
--- a/Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.m Sun Jun 26 10:13:19 2011 -0500
@@ -47,7 +47,7 @@
[adium.preferenceController registerDefaults:[NSDictionary dictionaryNamed:DUAL_INTERFACE_DEFAULT_PREFS forClass:[self class]]
forGroup:PREF_GROUP_DUAL_WINDOW_INTERFACE];
- preferenceMessageAdvController = [[ESDualWindowMessageAdvancedPreferences preferencePane] retain];
+ preferenceMessageAdvController = [(ESDualWindowMessageAdvancedPreferences *)[ESDualWindowMessageAdvancedPreferences preferencePane] retain];
//Watch Adium hide and unhide (Used for better window opening behavior)
[[NSNotificationCenter defaultCenter] addObserver:self
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Error Message Handler/ErrorMessageHandlerPlugin.m
--- a/Plugins/Error Message Handler/ErrorMessageHandlerPlugin.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Error Message Handler/ErrorMessageHandlerPlugin.m Sun Jun 26 10:13:19 2011 -0500
@@ -101,7 +101,7 @@
return [NSImage imageNamed:@"ErrorAlert" forClass:[self class]];
}
-- (AIModularPane *)detailsPaneForActionID:(NSString *)actionID
+- (AIActionDetailsPane *)detailsPaneForActionID:(NSString *)actionID
{
return [ESPanelAlertDetailPane actionDetailsPane];
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/General Preferences/ESGeneralPreferencesPlugin.m
--- a/Plugins/General Preferences/ESGeneralPreferencesPlugin.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/General Preferences/ESGeneralPreferencesPlugin.m Sun Jun 26 10:13:19 2011 -0500
@@ -64,7 +64,7 @@
forGroup:PREF_GROUP_CONFIRMATIONS];
//Install our preference view
- preferences = [[ESGeneralPreferences preferencePaneForPlugin:self] retain];
+ preferences = [(ESGeneralPreferences *)[ESGeneralPreferences preferencePaneForPlugin:self] retain];
[adium.preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_GENERAL];
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Open Message Window Contact Alert/ESOpenMessageWindowContactAlertPlugin.m
--- a/Plugins/Open Message Window Contact Alert/ESOpenMessageWindowContactAlertPlugin.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Open Message Window Contact Alert/ESOpenMessageWindowContactAlertPlugin.m Sun Jun 26 10:13:19 2011 -0500
@@ -50,7 +50,7 @@
return [NSImage imageNamed:@"WindowAlert" forClass:[self class]];
}
-- (AIModularPane *)detailsPaneForActionID:(NSString *)actionID
+- (AIActionDetailsPane *)detailsPaneForActionID:(NSString *)actionID
{
return nil;
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Purple Service/CBPurpleAccount.h
--- a/Plugins/Purple Service/CBPurpleAccount.h Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Purple Service/CBPurpleAccount.h Sun Jun 26 10:13:19 2011 -0500
@@ -203,10 +203,10 @@
- (void)updateTopic:(NSString *)inTopic forChat:(AIChat *)chat withSource:(NSString *)source;
- (void)updateTitle:(NSString *)inTitle forChat:(AIChat *)chat;
- (void)convUpdateForChat:(AIChat *)chat type:(NSNumber *)type;
-- (void)renameParticipant:(NSString *)oldUID newName:(NSString *)newUID newAlias:(NSString *)newAlias flags:(AIGroupChatFlags)flags inChat:(AIChat *)chat;
+- (void)renameParticipant:(NSString *)oldUID newName:(NSString *)newUID newAlias:(NSString *)newAlias flags:(PurpleConvChatBuddyFlags)flags inChat:(AIChat *)chat;
- (void)removeUser:(NSString *)contactName fromChat:(AIChat *)chat;
- (void)updateUserListForChat:(AIChat *)chat users:(NSArray *)users newlyAdded:(BOOL)newlyAdded;
-- (void)updateUser:(NSString *)user forChat:(AIChat *)chat flags:(AIGroupChatFlags)flags alias:(NSString *)alias attributes:(NSDictionary *)attributes;
+- (void)updateUser:(NSString *)user forChat:(AIChat *)chat flags:(PurpleConvChatBuddyFlags)flags alias:(NSString *)alias attributes:(NSDictionary *)attributes;
- (NSDictionary *)willJoinChatUsingDictionary:(NSDictionary *)chatCreationDictionary;
- (BOOL)chatCreationDictionary:(NSDictionary *)chatCreationDict isEqualToDictionary:(NSDictionary *)baseDict;
- (NSDictionary *)extractChatCreationDictionaryFromConversation:(PurpleConversation *)conv;
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Purple Service/CBPurpleAccount.m Sun Jun 26 10:13:19 2011 -0500
@@ -793,7 +793,7 @@
// Set their status to unknown.
[contact setStatusWithName:nil
- statusType:AIUnknownStatus
+ statusType:AIOfflineStatusType
notify:NotifyLater];
[contact setValue:nil
@@ -846,7 +846,26 @@
object:chat];
}
-- (void)renameParticipant:(NSString *)oldUID newName:(NSString *)newUID newAlias:(NSString *)newAlias flags:(AIGroupChatFlags)flags inChat:(AIChat *)chat
+AIGroupChatFlags groupChatFlagsFromPurpleConvChatBuddyFlags(PurpleConvChatBuddyFlags flags)
+{
+ AIGroupChatFlags groupChatFlags = AIGroupChatNone;
+ if (flags & PURPLE_CBFLAGS_VOICE)
+ groupChatFlags &= AIGroupChatVoice;
+ if (flags & PURPLE_CBFLAGS_HALFOP)
+ groupChatFlags &= AIGroupChatHalfOp;
+ if (flags & PURPLE_CBFLAGS_OP)
+ groupChatFlags &= AIGroupChatOp;
+ if (flags & PURPLE_CBFLAGS_FOUNDER)
+ groupChatFlags &= AIGroupChatFounder;
+ if (flags & PURPLE_CBFLAGS_TYPING)
+ groupChatFlags &= AIGroupChatTyping;
+ if (flags & PURPLE_CBFLAGS_AWAY)
+ groupChatFlags &= AIGroupChatAway;
+
+ return groupChatFlags;
+}
+
+- (void)renameParticipant:(NSString *)oldUID newName:(NSString *)newUID newAlias:(NSString *)newAlias flags:(PurpleConvChatBuddyFlags)flags inChat:(AIChat *)chat
{
[chat removeSavedValuesForContactUID:oldUID];
@@ -858,7 +877,7 @@
contact = [self contactWithUID:newUID];
}
- [chat setFlags:flags forContact:contact];
+ [chat setFlags:groupChatFlagsFromPurpleConvChatBuddyFlags(flags) forContact:contact];
[chat setAlias:newAlias forContact:contact];
if (contact.isStranger) {
@@ -891,7 +910,7 @@
- (void)updateUser:(NSString *)user
forChat:(AIChat *)chat
- flags:(AIGroupChatFlags)flags
+ flags:(PurpleConvChatBuddyFlags)flags
alias:(NSString *)alias
attributes:(NSDictionary *)attributes
{
@@ -900,23 +919,24 @@
AIListContact *contact = [self contactWithUID:user];
AIGroupChatFlags oldFlags = [chat flagsForContact:contact];
+ AIGroupChatFlags newFlags = groupChatFlagsFromPurpleConvChatBuddyFlags(flags);
NSString *oldAlias = [chat aliasForContact:contact];
// Trigger an update if the alias or flags (ignoring away state) changes.
if ((alias && !oldAlias)
|| (!alias && oldAlias)
|| ![[chat aliasForContact:contact] isEqualToString:alias]
- || (flags & ~AIGroupChatAway) != (oldFlags & ~AIGroupChatAway)) {
+ || (newFlags & ~AIGroupChatAway) != (oldFlags & ~AIGroupChatAway)) {
triggerUserlistUpdate = YES;
}
[chat setAlias:alias forContact:contact];
- [chat setFlags:flags forContact:contact];
+ [chat setFlags:newFlags forContact:contact];
// Away changes only come in after the initial one, so we're safe in only updating it here.
if (contact.isStranger) {
[contact setStatusWithName:nil
- statusType:((flags & AIGroupChatAway) == AIGroupChatAway) ? AIAwayStatusType : AIAvailableStatusType
+ statusType:((newFlags & AIGroupChatAway) == AIGroupChatAway) ? AIAwayStatusType : AIAvailableStatusType
notify:NotifyLater];
}
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Purple Service/ESJabberService.m
--- a/Plugins/Purple Service/ESJabberService.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Purple Service/ESJabberService.m Sun Jun 26 10:13:19 2011 -0500
@@ -269,7 +269,7 @@
*/
- (NSCharacterSet *)allowedCharacters
{
- NSMutableCharacterSet *allowedCharacters = [[NSCharacterSet alloc] init];
+ NSMutableCharacterSet *allowedCharacters = [[NSMutableCharacterSet alloc] init];
NSCharacterSet *nodeSet = [self allowedCharactersInNode];
NSCharacterSet *domainSet = [self allowedCharactersInDomain];
NSCharacterSet *returnSet;
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Purple Service/SLPurpleCocoaAdapter.h
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.h Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.h Sun Jun 26 10:13:19 2011 -0500
@@ -86,7 +86,7 @@
- (void)OSCARSetFormatTo:(NSString *)inFormattedUID onAccount:(id)adiumAccount;
- (void)displayFileSendError;
-- (void *)handleNotifyMessageOfType:(PurpleNotifyType)type withTitle:(const char *)title primary:(const char *)primary secondary:(const char *)secondary;
+- (void *)handleNotifyMessageOfType:(PurpleNotifyMsgType)type withTitle:(const char *)title primary:(const char *)primary secondary:(const char *)secondary;
- (void *)handleNotifyFormattedWithTitle:(const char *)title primary:(const char *)primary secondary:(const char *)secondary text:(const char *)text;
- (void)performContactMenuActionFromDict:(NSDictionary *)dict forAccount:(id)adiumAccount;
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sun Jun 26 10:13:19 2011 -0500
@@ -751,7 +751,7 @@
#pragma mark Notify
// Notify ----------------------------------------------------------------------------------------------------------
// We handle the notify messages within SLPurpleCocoaAdapter so we can use our localized string macro
-- (void *)handleNotifyMessageOfType:(PurpleNotifyType)type withTitle:(const char *)title primary:(const char *)primary secondary:(const char *)secondary;
+- (void *)handleNotifyMessageOfType:(PurpleNotifyMsgType)type withTitle:(const char *)title primary:(const char *)primary secondary:(const char *)secondary;
{
NSString *primaryString = [NSString stringWithUTF8String:primary];
diff -r c9f8919114a4 -r f5412548f2f3 Plugins/Purple Service/ca.lproj/ESPurpleJabberAccountView.nib/designable.nib
--- a/Plugins/Purple Service/ca.lproj/ESPurpleJabberAccountView.nib/designable.nib Sat Jun 25 16:31:14 2011 -0500
+++ b/Plugins/Purple Service/ca.lproj/ESPurpleJabberAccountView.nib/designable.nib Sun Jun 26 10:13:19 2011 -0500
@@ -2,30 +2,45 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.SystemVersion">10J4138</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1864</string>
<string key="IBDocument.AppKitVersion">1038.35</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">788</string>
+ <string key="NS.object.0">1864</string>
</object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="146"/>
+ <string>NSScroller</string>
+ <string>NSMenu</string>
+ <string>NSButton</string>
+ <string>NSCustomObject</string>
+ <string>NSTableView</string>
+ <string>NSCustomView</string>
+ <string>NSComboBox</string>
+ <string>NSComboBoxCell</string>
+ <string>NSTextField</string>
+ <string>NSNumberFormatter</string>
+ <string>NSWindowTemplate</string>
+ <string>NSTextFieldCell</string>
+ <string>NSButtonCell</string>
+ <string>NSTableColumn</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSView</string>
+ <string>NSScrollView</string>
+ <string>NSProgressIndicator</string>
+ <string>NSTextView</string>
+ <string>NSPopUpButton</string>
+ <string>NSMenuItem</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="520546697">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -39,7 +54,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="837853317">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -197,6 +212,7 @@
</object>
</object>
<string key="NSFrameSize">{457, 127}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -542,7 +558,7 @@
<object class="NSPopUpButton" id="86797681">
<reference key="NSNextResponder" ref="881248978"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{200, 41}, {198, 26}}</string>
+ <string key="NSFrame">{{200, 41}, {225, 26}}</string>
<reference key="NSSuperview" ref="881248978"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="686819324">
@@ -559,24 +575,7 @@
</object>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="514632623">
- <reference key="NSMenu" ref="502010925"/>
- <string key="NSTitle">Pregunta què fer</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="687604397">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="959336238">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="686819324"/>
- </object>
+ <nil key="NSMenuItem"/>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="502010925">
<object class="NSMutableString" key="NSTitle">
@@ -584,7 +583,23 @@
</object>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="514632623"/>
+ <object class="NSMenuItem" id="514632623">
+ <reference key="NSMenu" ref="502010925"/>
+ <string key="NSTitle">Pregunta què fer</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <object class="NSCustomResource" key="NSOnImage" id="687604397">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="959336238">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="686819324"/>
+ </object>
<object class="NSMenuItem" id="76618968">
<reference key="NSMenu" ref="502010925"/>
<string key="NSTitle">Accepta</string>
@@ -623,6 +638,7 @@
</object>
</object>
</object>
+ <int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
@@ -831,7 +847,7 @@
<reference key="NSSupport" ref="745543233"/>
<reference key="NSControlView" ref="753162121"/>
<int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
+ <int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="634818190"/>
<reference key="NSAlternateImage" ref="10299655"/>
<string key="NSAlternateContents"/>
@@ -847,7 +863,7 @@
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="809544060">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -856,7 +872,6 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{90, 24}, {309, 18}}</string>
<reference key="NSSuperview" ref="809544060"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="767290510">
<int key="NSCellFlags">67239424</int>
@@ -879,7 +894,6 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{24, 25}, {63, 17}}</string>
<reference key="NSSuperview" ref="809544060"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="492202865">
<int key="NSCellFlags">67239424</int>
More information about the commits
mailing list