--- a/Adium.xcodeproj/project.pbxproj Wed Jan 25 10:44:25 2012 -0500
+++ b/Adium.xcodeproj/project.pbxproj Wed Jan 25 14:52:06 2012 -0500
@@ -45,7 +45,7 @@
/* Begin PBXBuildFile section */
071C56330827933100399C0F /* Shared Dock Icon Images in Resources */ = {isa = PBXBuildFile; fileRef = 071C56310827933000399C0F /* Shared Dock Icon Images */; };
073475F10C4C9632009ACC43 /* AdiumMenuBarIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 073475F00C4C9632009ACC43 /* AdiumMenuBarIcons.icns */; };
- 074DDB5D07CB413F0033AFF7 /* CBContactLastSeenPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 074DDB5C07CB413F0033AFF7 /* CBContactLastSeenPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 074DDB5D07CB413F0033AFF7 /* CBContactLastSeenPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 074DDB5C07CB413F0033AFF7 /* CBContactLastSeenPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 07632BF30949E10B00FFABD8 /* ListThemeSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42B080870A200E27095 /* ListThemeSheet.nib */; };
0779934F08221D9700F698DC /* Service Icons in Resources */ = {isa = PBXBuildFile; fileRef = 4BAFD5E806E00D1700FF7FBC /* Service Icons */; };
07C6EA890C06676400B79CBD /* AdiumHelp in Resources */ = {isa = PBXBuildFile; fileRef = 07C6EA3C0C06676400B79CBD /* AdiumHelp */; };
@@ -55,38 +55,38 @@
0CAC6A140C0C657A0090AE95 /* Adium.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 0CAC6A130C0C657A0090AE95 /* Adium.sdef */; };
0CD3C3AD0C43C8CC003E637C /* NSWindowScriptingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD3C3AB0C43C8CC003E637C /* NSWindowScriptingAdditions.m */; settings = {COMPILER_FLAGS = ""; }; };
0CD41C710C2776550082F83B /* AICreateCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD41C6F0C2776550082F83B /* AICreateCommand.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 0CFA98C90D35C18000A077C6 /* NSDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFA98C70D35C18000A077C6 /* NSDataAdditions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 0CFA98C90D35C18000A077C6 /* NSDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFA98C70D35C18000A077C6 /* NSDataAdditions.m */; settings = {COMPILER_FLAGS = ""; }; }; 11000D041098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11000D031098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m */; };
110763F608676CC9005987A5 /* RAFBlockEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 110763F208676CC9005987A5 /* RAFBlockEditorPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
110763F808676CC9005987A5 /* RAFBlockEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110763F408676CC9005987A5 /* RAFBlockEditorWindowController.m */; settings = {COMPILER_FLAGS = ""; }; };
110763FA08676D05005987A5 /* BlockEditorWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 110763F908676D04005987A5 /* BlockEditorWindow.nib */; };
11077B6F0DE647C100A4DD25 /* AIStatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 11077B6E0DE647C100A4DD25 /* AIStatusItemView.m */; settings = {COMPILER_FLAGS = ""; }; };
1109634C0F61C1D00064CA0E /* AITwitterReplyWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1109634B0F61C1D00064CA0E /* AITwitterReplyWindow.nib */; };
- 1109661A0F61D3E70064CA0E /* AITwitterReplyWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110966190F61D3E70064CA0E /* AITwitterReplyWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 1109661A0F61D3E70064CA0E /* AITwitterReplyWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 110966190F61D3E70064CA0E /* AITwitterReplyWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; 1111B2300F8478500068CE51 /* Filter Bar.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1111B22F0F8478500068CE51 /* Filter Bar.nib */; };
1111B2680F847CAD0068CE51 /* AIFilterBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1111B2670F847CAD0068CE51 /* AIFilterBarView.m */; settings = {COMPILER_FLAGS = ""; }; };
111256060F8DA2B200E76177 /* ESBonjourAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F4675B080F46AC007800AB /* ESBonjourAccountView.nib */; };
- 111256070F8DA2BF00E76177 /* AWEzv.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D30655E90C00B791E5 /* AWEzv.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256080F8DA2BF00E76177 /* AWEzvContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D50655E90C00B791E5 /* AWEzvContact.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256090F8DA2BF00E76177 /* AWEzvSupportRoutines.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5EF0655E90D00B791E5 /* AWEzvSupportRoutines.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112560A0F8DA2BF00E76177 /* AWEzvContactManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F30655E90D00B791E5 /* AWEzvContactManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112560B0F8DA2BF00E76177 /* AWEzvContactManagerListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F50655E90D00B791E5 /* AWEzvContactManagerListener.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112560C0F8DA2BF00E76177 /* AWEzvContactManagerRendezvous.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F70655E90D00B791E5 /* AWEzvContactManagerRendezvous.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112560D0F8DA2BF00E76177 /* AWEzvPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FB0655E90D00B791E5 /* AWEzvPrivate.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112560E0F8DA2BF00E76177 /* AWEzvRendezvousData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FD0655E90D00B791E5 /* AWEzvRendezvousData.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112560F0F8DA2BF00E76177 /* AWEzvStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FF0655E90D00B791E5 /* AWEzvStack.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256100F8DA2BF00E76177 /* AWEzvXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6010655E90D00B791E5 /* AWEzvXMLNode.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256110F8DA2BF00E76177 /* AWEzvXMLStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6030655E90D00B791E5 /* AWEzvXMLStream.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256120F8DA2BF00E76177 /* ESBonjourAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46755080F46AB007800AB /* ESBonjourAccountViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256130F8DA2BF00E76177 /* AWBonjourPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46757080F46AB007800AB /* AWBonjourPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256140F8DA2BF00E76177 /* AWBonjourAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46759080F46AB007800AB /* AWBonjourAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256150F8DA2BF00E76177 /* AWBonjourService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F4675C080F46AC007800AB /* AWBonjourService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256160F8DA2BF00E76177 /* EKEzvFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAFD7B20C4FD00100EDB3B8 /* EKEzvFileTransfer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256170F8DA2BF00E76177 /* AsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330970C7235AD00B001A8 /* AsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256180F8DA2BF00E76177 /* HTTPAuthenticationRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330990C7235AD00B001A8 /* HTTPAuthenticationRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 111256190F8DA2BF00E76177 /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB3309B0C7235AD00B001A8 /* HTTPServer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112561A0F8DA2BF00E76177 /* EKEzvIncomingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1112561B0F8DA2BF00E76177 /* EKEzvOutgoingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 111256070F8DA2BF00E76177 /* AWEzv.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D30655E90C00B791E5 /* AWEzv.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256080F8DA2BF00E76177 /* AWEzvContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5D50655E90C00B791E5 /* AWEzvContact.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256090F8DA2BF00E76177 /* AWEzvSupportRoutines.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5EF0655E90D00B791E5 /* AWEzvSupportRoutines.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112560A0F8DA2BF00E76177 /* AWEzvContactManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F30655E90D00B791E5 /* AWEzvContactManager.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112560B0F8DA2BF00E76177 /* AWEzvContactManagerListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F50655E90D00B791E5 /* AWEzvContactManagerListener.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112560C0F8DA2BF00E76177 /* AWEzvContactManagerRendezvous.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5F70655E90D00B791E5 /* AWEzvContactManagerRendezvous.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112560D0F8DA2BF00E76177 /* AWEzvPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FB0655E90D00B791E5 /* AWEzvPrivate.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112560E0F8DA2BF00E76177 /* AWEzvRendezvousData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FD0655E90D00B791E5 /* AWEzvRendezvousData.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112560F0F8DA2BF00E76177 /* AWEzvStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F5FF0655E90D00B791E5 /* AWEzvStack.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256100F8DA2BF00E76177 /* AWEzvXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6010655E90D00B791E5 /* AWEzvXMLNode.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256110F8DA2BF00E76177 /* AWEzvXMLStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4947F6030655E90D00B791E5 /* AWEzvXMLStream.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256120F8DA2BF00E76177 /* ESBonjourAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46755080F46AB007800AB /* ESBonjourAccountViewController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256130F8DA2BF00E76177 /* AWBonjourPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46757080F46AB007800AB /* AWBonjourPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256140F8DA2BF00E76177 /* AWBonjourAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46759080F46AB007800AB /* AWBonjourAccount.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256150F8DA2BF00E76177 /* AWBonjourService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F4675C080F46AC007800AB /* AWBonjourService.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256160F8DA2BF00E76177 /* EKEzvFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAFD7B20C4FD00100EDB3B8 /* EKEzvFileTransfer.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256170F8DA2BF00E76177 /* AsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330970C7235AD00B001A8 /* AsyncSocket.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256180F8DA2BF00E76177 /* HTTPAuthenticationRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330990C7235AD00B001A8 /* HTTPAuthenticationRequest.m */; settings = {COMPILER_FLAGS = ""; }; }; + 111256190F8DA2BF00E76177 /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB3309B0C7235AD00B001A8 /* HTTPServer.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112561A0F8DA2BF00E76177 /* EKEzvIncomingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1112561B0F8DA2BF00E76177 /* EKEzvOutgoingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */; settings = {COMPILER_FLAGS = ""; }; }; 111256200F8DA2DB00E76177 /* libexpat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6341AEFE0E53A09C00AE1439 /* libexpat.dylib */; };
111256210F8DA2DB00E76177 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 636C6E5D0ED56D0100E0E528 /* libcrypto.dylib */; };
111D58210F7FC1B900883487 /* AIListContactGroupChatCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 111D581F0F7FC1B900883487 /* AIListContactGroupChatCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -95,7 +95,7 @@
111E89010F93FE3900A5F18B /* AIRealNameTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 111E88FE0F93FE3900A5F18B /* AIRealNameTooltip.m */; };
111E89020F93FE3900A5F18B /* AIUserHostTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 111E89000F93FE3900A5F18B /* AIUserHostTooltip.m */; settings = {COMPILER_FLAGS = ""; }; };
1121B29A0F896A720047EC66 /* AIContactVisibilityControlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1121B2990F896A720047EC66 /* AIContactVisibilityControlPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
- 112523190F5F7F86003FC58A /* AITwitterURLHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 112523180F5F7F86003FC58A /* AITwitterURLHandler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 112523190F5F7F86003FC58A /* AITwitterURLHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 112523180F5F7F86003FC58A /* AITwitterURLHandler.m */; settings = {COMPILER_FLAGS = ""; }; }; 112939020FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 112939010FD5AC1B00FA8F53 /* AIConfirmationsAdvancedPreferences.nib */; };
112939100FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 1129390F0FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m */; };
112B47240F82DC2300690E84 /* AIGroupChatStatusIcons.h in Headers */ = {isa = PBXBuildFile; fileRef = 112B47220F82DC2300690E84 /* AIGroupChatStatusIcons.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -110,17 +110,17 @@
1130EA99109B445500FB3454 /* pref-defaultclient.png in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.png */; };
1130EA9D109B445D00FB3454 /* pref-mention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.png */; };
1130EA9E109B445D00FB3454 /* pref-messagealerts.png in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9C109B445D00FB3454 /* pref-messagealerts.png */; };
- 113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891820F6B6AFF00A7D7DC /* AILaconicaService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891890F6B6B2800A7D7DC /* AILaconicaAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1138918C0F6B6B3F00A7D7DC /* AILaconicaPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 113891950F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891940F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891820F6B6AFF00A7D7DC /* AILaconicaService.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891890F6B6B2800A7D7DC /* AILaconicaAccount.m */; settings = {COMPILER_FLAGS = ""; }; }; + 1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1138918C0F6B6B3F00A7D7DC /* AILaconicaPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 113891950F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891940F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m */; settings = {COMPILER_FLAGS = ""; }; }; 113892270F6B70CA00A7D7DC /* laconica-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892250F6B70CA00A7D7DC /* laconica-small.png */; };
113892280F6B70CA00A7D7DC /* laconica.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892260F6B70CA00A7D7DC /* laconica.png */; };
113900B10F85BEF60081A418 /* AIURLHandlerPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 113900B00F85BEF60081A418 /* AIURLHandlerPreferences.nib */; };
113900B40F85BF880081A418 /* AIURLHandlerAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 113900B30F85BF880081A418 /* AIURLHandlerAdvancedPreferences.m */; settings = {COMPILER_FLAGS = ""; }; };
1139011C0F85C9450081A418 /* AIURLHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139011B0F85C9450081A418 /* AIURLHandlerPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
1139FFAA0F85260E0081A418 /* AIIRCChannelLinker.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139FFA90F85260E0081A418 /* AIIRCChannelLinker.m */; settings = {COMPILER_FLAGS = ""; }; };
- 113F26A00F5CC03F00954772 /* AITwitterURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 113F269F0F5CC03F00954772 /* AITwitterURLParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 113F26A00F5CC03F00954772 /* AITwitterURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 113F269F0F5CC03F00954772 /* AITwitterURLParser.m */; settings = {COMPILER_FLAGS = ""; }; }; 114849B90F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 114849B70F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
114849BA0F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 114849B80F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m */; };
114849BC0F78420300EA5264 /* AIAuthorizationRequestsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 114849BB0F78420300EA5264 /* AIAuthorizationRequestsWindow.nib */; };
@@ -199,19 +199,19 @@
11EE1CD50CDD01120097F246 /* libpurple.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
11F145F00B546AC500CA91F6 /* Menu Bar Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 11F145C70B546A6D00CA91F6 /* Menu Bar Icons */; };
11F1460C0B546C1200CA91F6 /* AIMenuBarIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F1460A0B546C1200CA91F6 /* AIMenuBarIcons.m */; settings = {COMPILER_FLAGS = ""; }; };
- 11F738F20F58D12200B3285B /* AITwitterAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F10F58D12200B3285B /* AITwitterAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F738F90F58D18700B3285B /* AITwitterService.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F80F58D18700B3285B /* AITwitterService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F738FC0F58D19B00B3285B /* AITwitterPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738FB0F58D19B00B3285B /* AITwitterPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739020F58D1C400B3285B /* AITwitterAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739010F58D1C400B3285B /* AITwitterAccountViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F7397A0F58D4DC00B3285B /* MGTwitterEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395B0F58D4DC00B3285B /* MGTwitterEngine.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F7397B0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395F0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F7397E0F58D4DD00B3285B /* MGTwitterMessagesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739650F58D4DC00B3285B /* MGTwitterMessagesParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739800F58D4DD00B3285B /* MGTwitterMiscParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739690F58D4DC00B3285B /* MGTwitterMiscParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739820F58D4DD00B3285B /* MGTwitterStatusesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7396F0F58D4DC00B3285B /* MGTwitterStatusesParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739840F58D4DD00B3285B /* MGTwitterUsersParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739730F58D4DC00B3285B /* MGTwitterUsersParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739850F58D4DD00B3285B /* MGTwitterXMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739750F58D4DC00B3285B /* MGTwitterXMLParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739860F58D4DD00B3285B /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739770F58D4DC00B3285B /* NSData+Base64.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11F739870F58D4DD00B3285B /* NSString+UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739790F58D4DC00B3285B /* NSString+UUID.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 11F738F20F58D12200B3285B /* AITwitterAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F10F58D12200B3285B /* AITwitterAccount.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F738F90F58D18700B3285B /* AITwitterService.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F80F58D18700B3285B /* AITwitterService.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F738FC0F58D19B00B3285B /* AITwitterPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738FB0F58D19B00B3285B /* AITwitterPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739020F58D1C400B3285B /* AITwitterAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739010F58D1C400B3285B /* AITwitterAccountViewController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F7397A0F58D4DC00B3285B /* MGTwitterEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395B0F58D4DC00B3285B /* MGTwitterEngine.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F7397B0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395F0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F7397E0F58D4DD00B3285B /* MGTwitterMessagesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739650F58D4DC00B3285B /* MGTwitterMessagesParser.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739800F58D4DD00B3285B /* MGTwitterMiscParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739690F58D4DC00B3285B /* MGTwitterMiscParser.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739820F58D4DD00B3285B /* MGTwitterStatusesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7396F0F58D4DC00B3285B /* MGTwitterStatusesParser.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739840F58D4DD00B3285B /* MGTwitterUsersParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739730F58D4DC00B3285B /* MGTwitterUsersParser.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739850F58D4DD00B3285B /* MGTwitterXMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739750F58D4DC00B3285B /* MGTwitterXMLParser.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739860F58D4DD00B3285B /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739770F58D4DC00B3285B /* NSData+Base64.m */; settings = {COMPILER_FLAGS = ""; }; }; + 11F739870F58D4DD00B3285B /* NSString+UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739790F58D4DC00B3285B /* NSString+UUID.m */; settings = {COMPILER_FLAGS = ""; }; }; 11FC23C20F768C1600C1C906 /* AIXMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 11FC23BF0F768C0900C1C906 /* AIXMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
11FC23C30F768C2900C1C906 /* AIXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 11FC23C00F768C0900C1C906 /* AIXMLElement.m */; };
31034EFF0C8142680003F5AA /* TestStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31034EFE0C8142680003F5AA /* TestStringAdditions.m */; };
@@ -283,8 +283,8 @@
3428328907D2643F004F01C9 /* ESStatusPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428328507D2643F004F01C9 /* ESStatusPreferences.m */; settings = {COMPILER_FLAGS = ""; }; };
3428328B07D2643F004F01C9 /* ESStatusPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3428328707D2643F004F01C9 /* ESStatusPreferencesPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
342838EE07D2D004004F01C9 /* Shared Dock Icon Images in Resources */ = {isa = PBXBuildFile; fileRef = 342838ED07D2D004004F01C9 /* Shared Dock Icon Images */; };
- 342910CD07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 342910CB07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 3429BB06070378F700EED705 /* ESFileTransferMessagesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3429BB04070378F700EED705 /* ESFileTransferMessagesPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 342910CD07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 342910CB07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m */; settings = {COMPILER_FLAGS = ""; }; }; + 3429BB06070378F700EED705 /* ESFileTransferMessagesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3429BB04070378F700EED705 /* ESFileTransferMessagesPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 342F88BC0A2A74D50001DB29 /* SRKeyCodeTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88B00A2A74D30001DB29 /* SRKeyCodeTransformer.m */; settings = {COMPILER_FLAGS = ""; }; };
342F88BD0A2A74D50001DB29 /* SRValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88B10A2A74D40001DB29 /* SRValidator.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
342F88C00A2A74D50001DB29 /* SRRecorderControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 342F88B40A2A74D40001DB29 /* SRRecorderControl.m */; settings = {COMPILER_FLAGS = ""; }; };
@@ -320,7 +320,7 @@
343ECBEB0971B18200349098 /* ESShowContactInfoPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343ECBE90971B18200349098 /* ESShowContactInfoPromptController.m */; settings = {COMPILER_FLAGS = ""; }; };
343ECBEE0971B18E00349098 /* ShowContactInfoPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343ECBED0971B18E00349098 /* ShowContactInfoPrompt.nib */; };
343ECBFC0971B92100349098 /* AIBorderlessListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343ECBFA0971B92100349098 /* AIBorderlessListController.m */; settings = {COMPILER_FLAGS = ""; }; };
- 344458F0070B5BEF00D8E932 /* ESDebugWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344458EE070B5BEF00D8E932 /* ESDebugWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 344458F0070B5BEF00D8E932 /* ESDebugWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 344458EE070B5BEF00D8E932 /* ESDebugWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; 344499E90B23CA5D0054B761 /* adiumPurpleAccounts.h in Headers */ = {isa = PBXBuildFile; fileRef = 344499E70B23CA5D0054B761 /* adiumPurpleAccounts.h */; };
344499EA0B23CA5D0054B761 /* adiumPurpleAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 344499E80B23CA5D0054B761 /* adiumPurpleAccounts.m */; };
344838690BC85EF70083723B /* AccountListPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4B8C3CE80825F60B004B9F45 /* AccountListPreferences.nib */; };
@@ -362,7 +362,7 @@
34607F1009B2296A000DB3D2 /* AIHoveringPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607F0C09B2296A000DB3D2 /* AIHoveringPopUpButtonCell.m */; settings = {COMPILER_FLAGS = ""; }; };
34607F1209B2296A000DB3D2 /* AIHoveringPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607F0E09B2296A000DB3D2 /* AIHoveringPopUpButton.m */; settings = {COMPILER_FLAGS = ""; }; };
3461621406FB482D009181D8 /* UserList Theme.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3461621006FB482C009181D8 /* UserList Theme.plist */; };
- 3461621606FB482D009181D8 /* ESChatUserListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3461621206FB482C009181D8 /* ESChatUserListController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3461621606FB482D009181D8 /* ESChatUserListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3461621206FB482C009181D8 /* ESChatUserListController.m */; settings = {COMPILER_FLAGS = ""; }; }; 3461621706FB482D009181D8 /* UserList Layout.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3461621306FB482D009181D8 /* UserList Layout.plist */; };
346196F20D31607500763051 /* SRSnapback.png in Resources */ = {isa = PBXBuildFile; fileRef = 346196F10D31607500763051 /* SRSnapback.png */; };
346371080BCA0A5400AD57AD /* AIMessageTabSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */; settings = {COMPILER_FLAGS = ""; }; };
@@ -379,8 +379,8 @@
346636AC0D415440006C9034 /* FriBidi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3466368B0D41541A006C9034 /* FriBidi.framework */; };
346637690D415457006C9034 /* FriBidi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 3466368B0D41541A006C9034 /* FriBidi.framework */; };
346935D60BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */; settings = {COMPILER_FLAGS = ""; }; };
- 346BA33F0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 346BA33F0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; settings = {COMPILER_FLAGS = ""; }; }; 346BA3640774C35500628F06 /* GlobalEventsPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.nib */; };
346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */; };
347374BD0AA9206B00AD18E3 /* ShortcutRecorder.strings in Resources */ = {isa = PBXBuildFile; fileRef = 347374BB0AA9206B00AD18E3 /* ShortcutRecorder.strings */; };
@@ -391,33 +391,33 @@
347C6943080C8F2B00E69674 /* ESAwayStatusWindowPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347C6941080C8F2B00E69674 /* ESAwayStatusWindowPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
347C6949080C8F3B00E69674 /* ESAwayStatusWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347C6947080C8F3A00E69674 /* ESAwayStatusWindowController.m */; settings = {COMPILER_FLAGS = ""; }; };
347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
- 347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 347E781A07CA962100350507 /* userIconToolbar.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* userIconToolbar.png */; };
- 347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; 347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
- 347E784C07CA96D700350507 /* AIContactListEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E784A07CA96D600350507 /* AIContactListEditorPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E785407CA96E200350507 /* AINewContactWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785207CA96E200350507 /* AINewContactWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E786007CA970500350507 /* AINewGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785E07CA970500350507 /* AINewGroupWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 347E784C07CA96D700350507 /* AIContactListEditorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E784A07CA96D600350507 /* AIContactListEditorPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E785407CA96E200350507 /* AINewContactWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785207CA96E200350507 /* AINewContactWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E786007CA970500350507 /* AINewGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785E07CA970500350507 /* AINewGroupWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; 347E786B07CA972100350507 /* AddContact.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786907CA972100350507 /* AddContact.nib */; };
347E786C07CA972100350507 /* AddGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786A07CA972100350507 /* AddGroup.nib */; };
347E787807CA975900350507 /* AddContact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E787207CA975900350507 /* AddContact.png */; };
- 347E788907CA978E00350507 /* CBActionSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E788707CA978D00350507 /* CBActionSupportPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E791307CAA51500350507 /* AIManualSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790D07CAA51400350507 /* AIManualSort.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E791507CAA51500350507 /* ESStatusSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790F07CAA51400350507 /* ESStatusSort.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E791807CAA51500350507 /* AIAlphabeticalSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E791207CAA51400350507 /* AIAlphabeticalSort.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 347E788907CA978E00350507 /* CBActionSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E788707CA978D00350507 /* CBActionSupportPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E791307CAA51500350507 /* AIManualSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790D07CAA51400350507 /* AIManualSort.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E791507CAA51500350507 /* ESStatusSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790F07CAA51400350507 /* ESStatusSort.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E791807CAA51500350507 /* AIAlphabeticalSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E791207CAA51400350507 /* AIAlphabeticalSort.m */; settings = {COMPILER_FLAGS = ""; }; }; 347E792307CAA52300350507 /* StatusSortDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E791E07CAA52300350507 /* StatusSortDefaults.plist */; };
347E792507CAA52300350507 /* AlphabeticalSortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E792007CAA52300350507 /* AlphabeticalSortConfiguration.nib */; };
347E792607CAA52300350507 /* AlphabeticalSortDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E792107CAA52300350507 /* AlphabeticalSortDefaults.plist */; };
- 347E7A9007CAF88200350507 /* AIContactAwayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A8E07CAF88200350507 /* AIContactAwayPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7A9907CAF8AF00350507 /* ESContactClientPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9407CAF8AE00350507 /* ESContactClientPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7A9C07CAF8AF00350507 /* AIContactIdlePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9707CAF8AF00350507 /* AIContactIdlePlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7AA307CAF8DA00350507 /* BGContactNotesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AA107CAF8DA00350507 /* BGContactNotesPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7AAA07CAF8EE00350507 /* SAContactOnlineForPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AA807CAF8EE00350507 /* SAContactOnlineForPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7AB307CAF93700350507 /* AIContactOnlineSincePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AB107CAF93700350507 /* AIContactOnlineSincePlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7ABC07CAF94A00350507 /* ESContactServersideDisplayName.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7ABA07CAF94A00350507 /* ESContactServersideDisplayName.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 347E7ACF07CAF98500350507 /* AIListObjectContentsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7ACD07CAF98400350507 /* AIListObjectContentsPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 347E7A9007CAF88200350507 /* AIContactAwayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A8E07CAF88200350507 /* AIContactAwayPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7A9907CAF8AF00350507 /* ESContactClientPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9407CAF8AE00350507 /* ESContactClientPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7A9C07CAF8AF00350507 /* AIContactIdlePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7A9707CAF8AF00350507 /* AIContactIdlePlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7AA307CAF8DA00350507 /* BGContactNotesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AA107CAF8DA00350507 /* BGContactNotesPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7AAA07CAF8EE00350507 /* SAContactOnlineForPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AA807CAF8EE00350507 /* SAContactOnlineForPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7AB307CAF93700350507 /* AIContactOnlineSincePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7AB107CAF93700350507 /* AIContactOnlineSincePlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7ABC07CAF94A00350507 /* ESContactServersideDisplayName.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7ABA07CAF94A00350507 /* ESContactServersideDisplayName.m */; settings = {COMPILER_FLAGS = ""; }; }; + 347E7ACF07CAF98500350507 /* AIListObjectContentsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E7ACD07CAF98400350507 /* AIListObjectContentsPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 347F4B810D340F16006D5A56 /* AIPreferenceContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 347F4B800D340F16006D5A56 /* AIPreferenceContainer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
3482E0F50AB5064E00471992 /* AIAdiumProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3482E0EB0AB5063300471992 /* AIAdiumProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
348477140C1A5CE50019EF08 /* AIAnimatingListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348477120C1A5CE50019EF08 /* AIAnimatingListOutlineView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -577,11 +577,11 @@
349C2F470867AD16000BF883 /* ApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C2F460867AD16000BF883 /* ApplescriptRunner.m */; };
349C2FF00867AD65000BF883 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 349C2FEF0867AD65000BF883 /* Foundation.framework */; };
349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */ = {isa = PBXBuildFile; fileRef = 349C2EFA0867AC97000BF883 /* AdiumApplescriptRunner */; };
- 349C6E4907C96D45005EB896 /* CBContactCountingDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E4607C96D44005EB896 /* CBContactCountingDisplayPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 349C6E8E07C972B2005EB896 /* AIExtendedStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E8C07C972B2005EB896 /* AIExtendedStatusPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 349C6F6607C99ACF005EB896 /* ESContactListAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6F6407C99ACE005EB896 /* ESContactListAdvancedPreferences.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 349C6E4907C96D45005EB896 /* CBContactCountingDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E4607C96D44005EB896 /* CBContactCountingDisplayPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 349C6E8E07C972B2005EB896 /* AIExtendedStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E8C07C972B2005EB896 /* AIExtendedStatusPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 349C6F6607C99ACF005EB896 /* ESContactListAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6F6407C99ACE005EB896 /* ESContactListAdvancedPreferences.m */; settings = {COMPILER_FLAGS = ""; }; }; 349C7C7A07C9AE1B005EB896 /* ContactListAdvancedPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 349C6F8A07C99D2C005EB896 /* ContactListAdvancedPrefs.nib */; };
- 349E2E8E07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349E2E8C07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 349E2E8E07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349E2E8C07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m */; settings = {COMPILER_FLAGS = ""; }; }; 34A1A8CA0DFB246400AC78CF /* AISocialNetworkingStatusMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A1A8C80DFB246300AC78CF /* AISocialNetworkingStatusMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
34A1A8CB0DFB246400AC78CF /* AISocialNetworkingStatusMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1A8C90DFB246300AC78CF /* AISocialNetworkingStatusMenu.m */; };
34A1A8E70DFB276E00AC78CF /* SocialNetworkingCustomStatus.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1A8E60DFB276E00AC78CF /* SocialNetworkingCustomStatus.nib */; };
@@ -590,19 +590,19 @@
34A1AB6C0DFC531000AC78CF /* AIXMLChatlogConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1AB6B0DFC531000AC78CF /* AIXMLChatlogConverter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEE80DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib */; };
34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEED0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib */; };
- 34A1B2C30DFDBA1200AC78CF /* AIStringDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34A1B2C30DFDBA1200AC78CF /* AIStringDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */; settings = {COMPILER_FLAGS = ""; }; }; 34A250B607E0F822009854E1 /* StatusDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34A250B507E0F822009854E1 /* StatusDefaults.plist */; };
34A29DB706ED68C000E1366C /* Contact List in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 34A29D9406ED68BF00E1366C /* Contact List */; };
- 34A489F306F64359002C7C5F /* AISCLViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489F106F64359002C7C5F /* AISCLViewPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48A0106F6436D002C7C5F /* AIStandardListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FB06F6436D002C7C5F /* AIStandardListWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48A0406F6436D002C7C5F /* AIListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FE06F6436D002C7C5F /* AIListWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34A489F306F64359002C7C5F /* AISCLViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489F106F64359002C7C5F /* AISCLViewPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48A0106F6436D002C7C5F /* AIStandardListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FB06F6436D002C7C5F /* AIStandardListWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48A0406F6436D002C7C5F /* AIListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A489FE06F6436D002C7C5F /* AIListWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; 34A48A1006F64382002C7C5F /* ContactListWindowBorderless.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A48A0F06F64381002C7C5F /* ContactListWindowBorderless.nib */; };
- 34A48A1806F6438F002C7C5F /* AIBorderlessListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1406F6438F002C7C5F /* AIBorderlessListWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48A1906F6438F002C7C5F /* AIListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1506F6438F002C7C5F /* AIListController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48A3F06F64665002C7C5F /* AIListThemeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3B06F64664002C7C5F /* AIListThemeWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48A4106F64665002C7C5F /* AIListLayoutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3D06F64665002C7C5F /* AIListLayoutWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48A5006F64692002C7C5F /* AITextColorPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A4F06F64692002C7C5F /* AITextColorPreviewView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34A48B3A06F64B27002C7C5F /* AIBorderlessListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48B3806F64B27002C7C5F /* AIBorderlessListOutlineView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34A48A1806F6438F002C7C5F /* AIBorderlessListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1406F6438F002C7C5F /* AIBorderlessListWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48A1906F6438F002C7C5F /* AIListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A1506F6438F002C7C5F /* AIListController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48A3F06F64665002C7C5F /* AIListThemeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3B06F64664002C7C5F /* AIListThemeWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48A4106F64665002C7C5F /* AIListLayoutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A3D06F64665002C7C5F /* AIListLayoutWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48A5006F64692002C7C5F /* AITextColorPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48A4F06F64692002C7C5F /* AITextColorPreviewView.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34A48B3A06F64B27002C7C5F /* AIBorderlessListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A48B3806F64B27002C7C5F /* AIBorderlessListOutlineView.m */; settings = {COMPILER_FLAGS = ""; }; }; 34A663920BF66D96008637BB /* PurpleCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 340915F105C0A5DF00CDE3DD /* PurpleCommon.h */; settings = {ATTRIBUTES = (Public, ); }; };
34A6F68507D65D6200972830 /* GeneralPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6F68407D65D6200972830 /* GeneralPreferences.nib */; };
34A6FAD907D6F3AA00972830 /* AIEventSoundsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6FAD507D6F3A600972830 /* AIEventSoundsPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
@@ -621,11 +621,11 @@
34B1268F0B924E28003B0451 /* adiumPurpleDnsRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B1268D0B924E28003B0451 /* adiumPurpleDnsRequest.m */; };
34B3247A0CE4CCF400158D5F /* PurpleAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B324780CE4CCF400158D5F /* PurpleAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
34B3247B0CE4CCF400158D5F /* PurpleAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B324790CE4CCF400158D5F /* PurpleAccountViewController.m */; };
- 34B4B5A40708B049002C4C6D /* ESDebugController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B4B5A20708B049002C4C6D /* ESDebugController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34B4B5A40708B049002C4C6D /* ESDebugController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B4B5A20708B049002C4C6D /* ESDebugController.m */; settings = {COMPILER_FLAGS = ""; }; }; 34B588A1058D833A00E7EF0D /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34B588A0058D833A00E7EF0D /* ExceptionHandling.framework */; };
34B5E2600A7C94D3005186E6 /* AILogDateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B5E25E0A7C94D3005186E6 /* AILogDateFormatter.m */; settings = {COMPILER_FLAGS = ""; }; };
34B9C7920A255DCE00CEA8AE /* LogViewerDateFilter.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B9C7910A255DCE00CEA8AE /* LogViewerDateFilter.nib */; };
- 34BC8F7B0ACA3AAC00562745 /* AIScannerDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC8F790ACA3AAC00562745 /* AIScannerDebug.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34BC8F7B0ACA3AAC00562745 /* AIScannerDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC8F790ACA3AAC00562745 /* AIScannerDebug.m */; settings = {COMPILER_FLAGS = ""; }; }; 34BD9D4A053146CC000AB133 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F59DB6AD033EB74801A8010A /* main.m */; settings = {COMPILER_FLAGS = ""; }; };
34BD9D4C053146CC000AB133 /* AIContactInfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A59903704B6101A8010A /* AIContactInfoWindowController.m */; settings = {COMPILER_FLAGS = ""; }; };
34BD9D54053146CC000AB133 /* AIAdium.m in Sources */ = {isa = PBXBuildFile; fileRef = F59DB3D7033EA9CD01A8010A /* AIAdium.m */; settings = {COMPILER_FLAGS = ""; }; };
@@ -640,11 +640,11 @@
34BFE20207E8E11500AD984D /* AIChatCyclingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE20007E8E11500AD984D /* AIChatCyclingPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
34BFE25007E8E5F200AD984D /* AIAutoLinkingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE24E07E8E5F100AD984D /* AIAutoLinkingPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
34BFE2D807E8E74400AD984D /* AIChatConsolidationPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFE2D607E8E74400AD984D /* AIChatConsolidationPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
- 34C14CD307A8B1AB003CC138 /* AIEmoticonPackPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C14CD107A8B1AB003CC138 /* AIEmoticonPackPreviewView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34C14CD307A8B1AB003CC138 /* AIEmoticonPackPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C14CD107A8B1AB003CC138 /* AIEmoticonPackPreviewView.m */; settings = {COMPILER_FLAGS = ""; }; }; 34C14D5107A8BA00003CC138 /* EmoticonPackPreview.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C14D5007A8BA00003CC138 /* EmoticonPackPreview.nib */; };
34C18B0D06CAC95400FF5FF9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E839050583207E00F2AADB /* SystemConfiguration.framework */; };
- 34C68B260778FA1300EB423C /* ESGeneralPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B240778FA1300EB423C /* ESGeneralPreferencesPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34C68B2C0778FA5C00EB423C /* ESGeneralPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B2A0778FA5C00EB423C /* ESGeneralPreferences.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34C68B260778FA1300EB423C /* ESGeneralPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B240778FA1300EB423C /* ESGeneralPreferencesPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34C68B2C0778FA5C00EB423C /* ESGeneralPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B2A0778FA5C00EB423C /* ESGeneralPreferences.m */; settings = {COMPILER_FLAGS = ""; }; }; 34C6A3BC077A8CB500EB423C /* AppearanceDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C6A3BB077A8CB500EB423C /* AppearanceDefaults.plist */; };
34C7C62809EC4E890060FB4A /* AILibpurplePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B3244309BA003C00029361 /* AILibpurplePlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
34C846AF101E515900140B4B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34C846AE101E515900140B4B /* QTKit.framework */; };
@@ -701,8 +701,8 @@
34D8332B07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8332A07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist */; };
34D8333207CBD741006466F2 /* ApplescriptContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333007CBD741006466F2 /* ApplescriptContactAlert.nib */; };
34D8333307CBD741006466F2 /* ApplescriptAlert.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333107CBD741006466F2 /* ApplescriptAlert.png */; };
- 34D8333B07CBD758006466F2 /* ESApplescriptContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333707CBD758006466F2 /* ESApplescriptContactAlertPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34D8333C07CBD758006466F2 /* ESPanelApplescriptDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333807CBD758006466F2 /* ESPanelApplescriptDetailPane.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D8333B07CBD758006466F2 /* ESApplescriptContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333707CBD758006466F2 /* ESApplescriptContactAlertPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34D8333C07CBD758006466F2 /* ESPanelApplescriptDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333807CBD758006466F2 /* ESPanelApplescriptDetailPane.m */; settings = {COMPILER_FLAGS = ""; }; }; 34D8337107CBD808006466F2 /* pref-general.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336807CBD807006466F2 /* pref-general.png */; };
34D8337407CBD808006466F2 /* pref-ft.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336B07CBD807006466F2 /* pref-ft.png */; };
34D8337507CBD808006466F2 /* pref-events.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336C07CBD807006466F2 /* pref-events.png */; };
@@ -957,7 +957,7 @@
34DC8B040A7EEEF7003E1636 /* ESFileWrapperExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F2E83807C2CDBD007EAAAB /* ESFileWrapperExtension.m */; };
34DC8B090A7EEEF7003E1636 /* JVFontPreviewField.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8344C07CBE6E2006466F2 /* JVFontPreviewField.m */; };
34DC8B0A0A7EEEF7003E1636 /* JVFontPreviewField.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8344D07CBE6E2006466F2 /* JVFontPreviewField.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 34DFF5FD07A63DB400B92233 /* ESSecureMessagingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34DFF46107A5EABF00B92233 /* ESSecureMessagingPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34DFF5FD07A63DB400B92233 /* ESSecureMessagingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34DFF46107A5EABF00B92233 /* ESSecureMessagingPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 34E036720A75AA4F00394F11 /* CBOscarService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B919C9062DEF15004F1223 /* CBOscarService.h */; };
34E036730A75AA4F00394F11 /* CBOscarService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B919CA062DEF15004F1223 /* CBOscarService.m */; };
34E036740A75AA4F00394F11 /* CBPurpleOscarAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EA125EE055B633000ECF349 /* CBPurpleOscarAccount.h */; };
@@ -976,13 +976,13 @@
34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41A08086D9100E27095 /* ESPurpleICQAccountView.nib */; };
34E0368F0A75AA4F00394F11 /* PurpleDefaultsICQ.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7644DC07A05E7E0021CCD7 /* PurpleDefaultsICQ.plist */; };
34E0EA0807CC53ED00A82198 /* NewMessagePrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34E0EA0707CC53EC00A82198 /* NewMessagePrompt.nib */; };
- 34E0EA0F07CC53FE00A82198 /* AINewMessagePanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34E0EA1007CC53FE00A82198 /* AINewMessagePromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34E2A0BC07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0BA07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34E2A0C307AF593B006735BC /* AIAccountMenuAccessPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0C107AF593B006735BC /* AIAccountMenuAccessPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34E2A1DB07AF6504006735BC /* AIDockAccountStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A1D907AF6503006735BC /* AIDockAccountStatusPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34E2A2F507B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A2EF07B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 34E2A3E807B08CCB006735BC /* AIAliasSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A3E507B08CC9006735BC /* AIAliasSupportPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34E0EA0F07CC53FE00A82198 /* AINewMessagePanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34E0EA1007CC53FE00A82198 /* AINewMessagePromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34E2A0BC07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0BA07AF5924006735BC /* ESAccountNetworkConnectivityPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34E2A0C307AF593B006735BC /* AIAccountMenuAccessPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A0C107AF593B006735BC /* AIAccountMenuAccessPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34E2A1DB07AF6504006735BC /* AIDockAccountStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A1D907AF6503006735BC /* AIDockAccountStatusPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34E2A2F507B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A2EF07B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m */; settings = {COMPILER_FLAGS = ""; }; }; + 34E2A3E807B08CCB006735BC /* AIAliasSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E2A3E507B08CC9006735BC /* AIAliasSupportPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 34E4CD580E68277D00D1B0DC /* ESIRCService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD4E0E68277D00D1B0DC /* ESIRCService.h */; };
34E4CD590E68277D00D1B0DC /* ESIRCJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E4CD4F0E68277D00D1B0DC /* ESIRCJoinChatViewController.m */; };
34E4CD5A0E68277D00D1B0DC /* ESIRCJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E4CD500E68277D00D1B0DC /* ESIRCJoinChatViewController.h */; };
@@ -1026,22 +1026,22 @@
4B08399C07D235190034A001 /* DockIconSelectionSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B08399B07D235190034A001 /* DockIconSelectionSheet.xib */; };
4B191D8A0611C10800E8A4E7 /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4B191D880611C10800E8A4E7 /* License.txt */; };
4B191D8B0611C10800E8A4E7 /* ReadMe.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4B191D890611C10800E8A4E7 /* ReadMe.rtf */; };
- 4B7A567B07A1754400BDC540 /* AIEditAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A567807A1754400BDC540 /* AIEditAccountWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 4B909C8A064D75400074C9A8 /* BGEmoticonMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = C4243C930638E4EA007AD2D9 /* BGEmoticonMenuPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 4B7A567B07A1754400BDC540 /* AIEditAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A567807A1754400BDC540 /* AIEditAccountWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 4B909C8A064D75400074C9A8 /* BGEmoticonMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = C4243C930638E4EA007AD2D9 /* BGEmoticonMenuPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 4B97DB6706AC123A0003EE49 /* linkToolbar.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B97DB6606AC123A0003EE49 /* linkToolbar.png */; };
4BA62D8E06C51257001D6B3C /* Status Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BA62D7F06C51256001D6B3C /* Status Icons */; };
4BAA1B530632EF0000D8B92C /* ErrorAlert.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BAA1B500632EF0000D8B92C /* ErrorAlert.png */; };
4BAA1B550632EF0000D8B92C /* ESPanelAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA1B520632EF0000D8B92C /* ESPanelAlertDetailPane.m */; settings = {COMPILER_FLAGS = ""; }; };
4BAA1B610632EFE700D8B92C /* WindowAlert.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BAA1B600632EFE700D8B92C /* WindowAlert.png */; };
- 4BAE6C1407CF9374007E2820 /* ESAnnouncerAbstractDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C0C07CF9374007E2820 /* ESAnnouncerAbstractDetailPane.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 4BAE6C1607CF9374007E2820 /* ESAnnouncerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C0E07CF9374007E2820 /* ESAnnouncerPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 4BAE6C1807CF9374007E2820 /* ESAnnouncerSpeakEventAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1007CF9374007E2820 /* ESAnnouncerSpeakEventAlertDetailPane.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 4BAE6C1A07CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1207CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 4BAE6C1407CF9374007E2820 /* ESAnnouncerAbstractDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C0C07CF9374007E2820 /* ESAnnouncerAbstractDetailPane.m */; settings = {COMPILER_FLAGS = ""; }; }; + 4BAE6C1607CF9374007E2820 /* ESAnnouncerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C0E07CF9374007E2820 /* ESAnnouncerPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 4BAE6C1807CF9374007E2820 /* ESAnnouncerSpeakEventAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1007CF9374007E2820 /* ESAnnouncerSpeakEventAlertDetailPane.m */; settings = {COMPILER_FLAGS = ""; }; }; + 4BAE6C1A07CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1207CF9374007E2820 /* ESAnnouncerSpeakTextAlertDetailPane.m */; settings = {COMPILER_FLAGS = ""; }; }; 4BAE6C1F07CF9389007E2820 /* AnnouncerAlert.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1B07CF9389007E2820 /* AnnouncerAlert.png */; };
4BAE6C2007CF9389007E2820 /* AnnouncerDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1C07CF9389007E2820 /* AnnouncerDefaults.plist */; };
4BAE6C2107CF9389007E2820 /* AnnouncerSpeakEventContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1D07CF9389007E2820 /* AnnouncerSpeakEventContactAlert.nib */; };
4BAE6C2207CF9389007E2820 /* AnnouncerSpeakTextContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C1E07CF9389007E2820 /* AnnouncerSpeakTextContactAlert.nib */; };
- 4BAE6C3607CF93CB007E2820 /* AIContactStatusEventsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C3407CF93CB007E2820 /* AIContactStatusEventsPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 4BAE6C3607CF93CB007E2820 /* AIContactStatusEventsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C3407CF93CB007E2820 /* AIContactStatusEventsPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 4BAE6C4707CF9411007E2820 /* AIDockBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4307CF9410007E2820 /* AIDockBehaviorPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
4BAE6C4907CF9411007E2820 /* ESDockAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4507CF9410007E2820 /* ESDockAlertDetailPane.m */; settings = {COMPILER_FLAGS = ""; }; };
4BAE6C4C07CF941C007E2820 /* DockAlert.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BAE6C4A07CF941C007E2820 /* DockAlert.png */; };
@@ -1086,9 +1086,9 @@
4BD6758406001E440049CAF7 /* ErrorMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0F1003B5C29E00A80202 /* ErrorMessageWindowController.m */; settings = {COMPILER_FLAGS = ""; }; };
4BD6758506001E450049CAF7 /* ErrorWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 40AC0F1303B5C34800A80202 /* ErrorWindow.nib */; };
4BD6758806001E460049CAF7 /* AlertMessageContactAlert.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3439FD8C05794B4500B2E449 /* AlertMessageContactAlert.nib */; };
- 4BDAF69907A1561000276D68 /* AIAccountProxySettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDAF69607A1561000276D68 /* AIAccountProxySettings.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 4BE6175807AC67EE0049C87D /* AIAutoReplyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6174E07AC67ED0049C87D /* AIAutoReplyPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 4BE6175E07AC67EE0049C87D /* AIStateMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6175407AC67EE0049C87D /* AIStateMenuPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 4BDAF69907A1561000276D68 /* AIAccountProxySettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDAF69607A1561000276D68 /* AIAccountProxySettings.m */; settings = {COMPILER_FLAGS = ""; }; }; + 4BE6175807AC67EE0049C87D /* AIAutoReplyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6174E07AC67ED0049C87D /* AIAutoReplyPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 4BE6175E07AC67EE0049C87D /* AIStateMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6175407AC67EE0049C87D /* AIStateMenuPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 4BE9FFE8055981AB00359B15 /* Adium.pch in Resources */ = {isa = PBXBuildFile; fileRef = 4BE9FFE7055981AB00359B15 /* Adium.pch */; };
4BF2EA3F067CB7A200743318 /* Emoticons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E194067CAE9200743318 /* Emoticons */; };
4BF2EA40067CB7A200743318 /* Message Styles in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E6B3067CB70E00743318 /* Message Styles */; };
@@ -1116,7 +1116,7 @@
5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */; };
5A799674133C3D6F0005AC6A /* MessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1FEA601334549300C14951 /* MessageView.xib */; };
5A804FEA12BE9E84007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
- 5A80508512BE9F00007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A80508512BE9F00007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; settings = {COMPILER_FLAGS = ""; }; }; 5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */; };
5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
5A9A9F8B11F295EB00328DF9 /* Stop sign.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* Stop sign.png */; };
@@ -1130,15 +1130,15 @@
6318DBA40F8D93F200C5E584 /* SoulEdge.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DF00063498ED0018E5D2 /* SoulEdge.png */; };
6318DBA50F8D93F200C5E584 /* terminator.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C2DF01063498ED0018E5D2 /* terminator.png */; };
6318DBA60F8D93F200C5E584 /* Template.html in Resources */ = {isa = PBXBuildFile; fileRef = 4B03711506595A70008F5981 /* Template.html */; };
- 6318DBB40F8D940A00C5E584 /* AIWebKitMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B539C5205EFD6FB00E5921A /* AIWebKitMessageViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBB50F8D940A00C5E584 /* AIWebKitMessageViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B539C4C05EFD6CD00E5921A /* AIWebKitMessageViewPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBB60F8D940A00C5E584 /* ESWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346C9A2405FFE3DF000F5A8A /* ESWebView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBB70F8D940A00C5E584 /* ESWebKitMessageViewPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2D70406338E2E0018E5D2 /* ESWebKitMessageViewPreferences.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBB80F8D940A00C5E584 /* AIWebkitMessageViewStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD62D7F07CE8F240099EBA2 /* AIWebkitMessageViewStyle.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBB90F8D940A00C5E584 /* AIPreviewChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 34182F490AC2CA3C0067DEF3 /* AIPreviewChat.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBBA0F8D940A00C5E584 /* AIWebKitDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B2590BF2EB93004CD99B /* AIWebKitDelegate.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBBB0F8D940A00C5E584 /* AIPreviewContentMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FA28100C820C3A00FEA944 /* AIPreviewContentMessage.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6318DBBC0F8D940A00C5E584 /* AIWebKitPreviewMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B59F0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 6318DBB40F8D940A00C5E584 /* AIWebKitMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B539C5205EFD6FB00E5921A /* AIWebKitMessageViewController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBB50F8D940A00C5E584 /* AIWebKitMessageViewPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B539C4C05EFD6CD00E5921A /* AIWebKitMessageViewPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBB60F8D940A00C5E584 /* ESWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346C9A2405FFE3DF000F5A8A /* ESWebView.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBB70F8D940A00C5E584 /* ESWebKitMessageViewPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2D70406338E2E0018E5D2 /* ESWebKitMessageViewPreferences.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBB80F8D940A00C5E584 /* AIWebkitMessageViewStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD62D7F07CE8F240099EBA2 /* AIWebkitMessageViewStyle.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBB90F8D940A00C5E584 /* AIPreviewChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 34182F490AC2CA3C0067DEF3 /* AIPreviewChat.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBBA0F8D940A00C5E584 /* AIWebKitDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B2590BF2EB93004CD99B /* AIWebKitDelegate.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBBB0F8D940A00C5E584 /* AIPreviewContentMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 34FA28100C820C3A00FEA944 /* AIPreviewContentMessage.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6318DBBC0F8D940A00C5E584 /* AIWebKitPreviewMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B59F0E03409F00AC78CF /* AIWebKitPreviewMessageViewController.m */; settings = {COMPILER_FLAGS = ""; }; }; 6318DBC20F8D943A00C5E584 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C103FAE057127A500F3C158 /* WebKit.framework */; };
63218C500E518A3D0008E0D0 /* AdiumAuthorization.m in Sources */ = {isa = PBXBuildFile; fileRef = 3486E8A5097F24A90044C496 /* AdiumAuthorization.m */; };
63218C720E518A940008E0D0 /* AdiumAuthorization.h in Headers */ = {isa = PBXBuildFile; fileRef = 3486E8A4097F24A90044C496 /* AdiumAuthorization.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1369,7 +1369,7 @@
636D94090E4EAB9D00E5F558 /* AIContactObserverManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 34555C5F0DB6BCE500649CD4 /* AIContactObserverManager.m */; };
637864550F9BE1AB0040DEDA /* AutoHyperlinks.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 3496A8EA07CE6CA30055BBAB /* AutoHyperlinks.framework */; };
638392F809D4D67A0067B9B7 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 638392F609D4D67A0067B9B7 /* Sparkle.framework */; };
- 638BC1FC0FC932E000CE7600 /* AIObjectDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 638BC1FB0FC932E000CE7600 /* AIObjectDebug.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 638BC1FC0FC932E000CE7600 /* AIObjectDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 638BC1FB0FC932E000CE7600 /* AIObjectDebug.m */; settings = {COMPILER_FLAGS = ""; }; }; 639484590EB13DFE008CB6DE /* AIContactHidingController.m in Sources */ = {isa = PBXBuildFile; fileRef = 661561640D84AEEC004B7946 /* AIContactHidingController.m */; };
6394845B0EB13E04008CB6DE /* AIContactHidingController.h in Headers */ = {isa = PBXBuildFile; fileRef = 661561630D84AEEC004B7946 /* AIContactHidingController.h */; settings = {ATTRIBUTES = (Public, ); }; };
639DF7710F97E61D003C9A32 /* CBPurpleServicePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7F278A05440C8D00CDFC90 /* CBPurpleServicePlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
@@ -1395,9 +1395,9 @@
63EA62F0094B8705009C8453 /* AIXtraInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA62EE094B8705009C8453 /* AIXtraInfoController.m */; settings = {COMPILER_FLAGS = ""; }; };
63EA63DD094BB79A009C8453 /* StatusIconPreviewView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 63336B3F094994A800970871 /* StatusIconPreviewView.nib */; };
63EA6409094BB9A9009C8453 /* AIStatusIconPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA6407094BB9A9009C8453 /* AIStatusIconPreviewController.m */; settings = {COMPILER_FLAGS = ""; }; };
- 6E4D961406B739AC005235E9 /* DCJoinChatPanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961206B739AC005235E9 /* DCJoinChatPanelPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 6E4D961406B739AC005235E9 /* DCJoinChatPanelPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961206B739AC005235E9 /* DCJoinChatPanelPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; + 6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; 6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
76889DEB12D3CA17007AEF00 /* GetInfo.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* GetInfo.png */; };
@@ -1406,9 +1406,9 @@
7E6F8A94105611B700C6D80D /* libotr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
7E6F8ACD105613AD00C6D80D /* libotr.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
7E824CDD06387FAF00813072 /* LinkEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 7E824CCE06387FAF00813072 /* LinkEditor.nib */; };
- 7E824CE106387FAF00813072 /* SHAutoValidatingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CD206387FAF00813072 /* SHAutoValidatingTextView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 7E824CE306387FAF00813072 /* SHLinkEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CD406387FAF00813072 /* SHLinkEditorWindowController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 7E824CEB06387FAF00813072 /* SHLinkManagementPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CDC06387FAF00813072 /* SHLinkManagementPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 7E824CE106387FAF00813072 /* SHAutoValidatingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CD206387FAF00813072 /* SHAutoValidatingTextView.m */; settings = {COMPILER_FLAGS = ""; }; }; + 7E824CE306387FAF00813072 /* SHLinkEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CD406387FAF00813072 /* SHLinkEditorWindowController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 7E824CEB06387FAF00813072 /* SHLinkManagementPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CDC06387FAF00813072 /* SHLinkManagementPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 7E959AD010E3187000C26397 /* AIMathCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E959ACF10E3187000C26397 /* AIMathCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7EC033B114590E0700CF24FB /* MessageWindow.xib */; };
811033510CDE170B00EC6038 /* ssl-cdsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 811033500CDE170B00EC6038 /* ssl-cdsa.c */; };
@@ -1459,10 +1459,10 @@
9E125C6607D3571400AA91C5 /* ESBlockingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E125C6407D3571400AA91C5 /* ESBlockingPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
9E1E1DFD0A96741500E16DFC /* LMX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1E1DFC0A96741500E16DFC /* LMX.framework */; };
9E1E1E270A96770C00E16DFC /* LMX.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1E1DFC0A96741500E16DFC /* LMX.framework */; };
- 9E20910E06A601AF00E33E27 /* CBStatusMenuItemController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E791DA40577094400547562 /* CBStatusMenuItemController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 9E20911006A601B200E33E27 /* CBStatusMenuItemPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E791D9505768B7A00547562 /* CBStatusMenuItemPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 9E20910E06A601AF00E33E27 /* CBStatusMenuItemController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E791DA40577094400547562 /* CBStatusMenuItemController.m */; settings = {COMPILER_FLAGS = ""; }; }; + 9E20911006A601B200E33E27 /* CBStatusMenuItemPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E791D9505768B7A00547562 /* CBStatusMenuItemPlugin.m */; settings = {COMPILER_FLAGS = ""; }; }; 9E217B7B06A74CA8002A3F27 /* StatusMenuItemDefaultPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9E217B7706A74CA7002A3F27 /* StatusMenuItemDefaultPrefs.plist */; };
- 9ECB03E709F2A9D900996F44 /* AIDictionaryDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ECB03E309F2A9D800996F44 /* AIDictionaryDebug.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 9ECB03E709F2A9D900996F44 /* AIDictionaryDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ECB03E309F2A9D800996F44 /* AIDictionaryDebug.m */; settings = {COMPILER_FLAGS = ""; }; }; 9ECB03E909F2A9D900996F44 /* AIXMLAppender.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ECB03E509F2A9D800996F44 /* AIXMLAppender.m */; settings = {COMPILER_FLAGS = ""; }; };
9EF0DBFA09D944C200FBCC1E /* Resources/block.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF309D944A300FBCC1E /* Resources/block.png */; };
9EF0DBFB09D944C200FBCC1E /* Resources/unblock.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF409D944A300FBCC1E /* Resources/unblock.png */; };
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Wed Jan 25 14:52:06 2012 -0500
@@ -78,7 +78,7 @@
- (void)breakdownServiceController;
- (DNSServiceRef)serviceRef;
-@property (readonly, nonatomic) AWEzvContactManager *contactManager;
+@property (unsafe_unretained, readonly, nonatomic) AWEzvContactManager *contactManager; @end // Interface ServiceController
@@ -188,7 +188,7 @@
/* Length of txt record in bytes, 0 for NULL txt record */ TXTRecordGetLength(&txtRecord) ,
/* Txt record properly formatted, may be NULL */ TXTRecordGetBytesPtr(&txtRecord) ,
/* Call back function, may be NULL */ register_reply,
- /* Application context pointer, may be null */ self
+ /* Application context pointer, may be null */ (__bridge void *)(self) if (dnsError == kDNSServiceErr_NoError) {
@@ -214,12 +214,12 @@
AILogWithSignature(@"isDisconnecting");
- [fServiceBrowser release]; fServiceBrowser = nil;
// Remove Resolvers, this also deallocates the DNSServiceReferences
if (fDomainBrowser != nil) {
AILogWithSignature(@"Releasing %@",fDomainBrowser);
- [fDomainBrowser release]; fDomainBrowser = nil;
@@ -385,7 +385,7 @@
SHA1_Update(&ctx, [JPEGData bytes], (unsigned long)[JPEGData length]);
SHA1_Final(digest, &ctx);
- imagehash = [[NSData dataWithBytes:digest length:20] retain];
+ imagehash = [NSData dataWithBytes:digest length:20]; AILogWithSignature(@"Will update with hash %@; length is %u", imagehash, [JPEGData length]);
@@ -396,7 +396,7 @@
- [userAnnounceData setField:@"phsh" content:[imagehash autorelease]];
+ [userAnnounceData setField:@"phsh" content:imagehash]; [self updateAnnounceInfo];
@@ -409,10 +409,7 @@
// Start browsing the network for new rendezvous clients
- [fServiceBrowser release]; fServiceBrowser = nil;
- // Destroy old contact dictionary if one exists
// Allocate new contact dictionary
contacts = [[NSMutableDictionary alloc] init];
@@ -427,7 +424,7 @@
/* Registration type */ "_presence._tcp",
/* Domain, may be null for default */ NULL,
/* CallBack function */ handle_av_browse_reply,
- /* Context, may be null */ self);
+ /* Context, may be null */ (__bridge void *)(self)); if (avBrowseError == kDNSServiceErr_NoError) {
fServiceBrowser = [[ServiceController alloc] initWithServiceRef:browsRef forContactManager:self];
@@ -441,8 +438,8 @@
// Stop looking for new rendezvous clients
- AILogWithSignature(@"fServiceBrowser is %@ (retain count %i)", fServiceBrowser, [fServiceBrowser retainCount]);
- [fServiceBrowser release]; fServiceBrowser = nil;
+ AILogWithSignature(@"fServiceBrowser is %@)", fServiceBrowser); // Handle a message from our browser
@@ -473,7 +470,6 @@
// Save contact in dictionary
[contacts setObject:contact forKey:replyNameString];
DNSServiceRef resolveRef;
@@ -487,14 +483,13 @@
/* Registration type */ "_presence._tcp" /* replyType */,
/* Domain */ replyDomain,
/* Callback */ resolve_reply,
- /* Contxt, may be NULL */ contact
+ /* Contxt, may be NULL */ (__bridge void *)contact if (resolveRefError == kDNSServiceErr_NoError) {
ServiceController *serviceResolver = [[ServiceController alloc] initWithServiceRef:resolveRef forContactManager:self];
[contact setResolveServiceController:serviceResolver];
[[contact resolveServiceController] addToCurrentRunLoop];
- [serviceResolver release];
[[client client] reportError:@"Could not search for TXT records" ofLevel:AWEzvConnectionError];
@@ -524,13 +519,12 @@
DNSServiceRef serviceRef;
err = DNSServiceQueryRecord( &serviceRef, (DNSServiceFlags) 0, interface, [host UTF8String],
- kDNSServiceType_A, kDNSServiceClass_IN, AddressQueryRecordReply, contact);
+ kDNSServiceType_A, kDNSServiceClass_IN, AddressQueryRecordReply, (__bridge void *)contact); if (err == kDNSServiceErr_NoError) {
ServiceController *temp = [[ServiceController alloc] initWithServiceRef:serviceRef forContactManager:self];
[contact setAddressServiceController:temp];
[[contact addressServiceController] addToCurrentRunLoop];
[[client client] reportError:@"Error finding adress for contact" ofLevel:AWEzvError];
@@ -553,7 +547,6 @@
// Save contact in dictionary
[contacts setObject:contact forKey:contact.uniqueID];
[[client client] reportError:@"Contact to update not in dictionary and has bad identifier" ofLevel:AWEzvError];
@@ -593,7 +586,7 @@
[contact setImageServiceController: nil];
- AILogWithSignature(@"%@ -> %@ (%i)", [NSData dataWithBytes:data length:dataLen], [[[NSImage alloc] initWithData:[NSData dataWithBytes:data length:dataLen]] autorelease], dataLen);
+ AILogWithSignature(@"%@ -> %@ (%i)", [NSData dataWithBytes:data length:dataLen], [[NSImage alloc] initWithData:[NSData dataWithBytes:data length:dataLen]], dataLen); @@ -629,7 +622,6 @@
// Save contact in dictionary
[contacts setObject:contact forKey:contact.uniqueID];
[[client client] reportError:@"Contact to update not in dictionary and has bad identifier" ofLevel:AWEzvError];
@@ -661,10 +653,10 @@
nick = [rendezvousData getField:@"last"];
- mutableNick = [[nick mutableCopy] autorelease];
+ mutableNick = [nick mutableCopy]; [mutableNick appendString:@" "];
[mutableNick appendString:[rendezvousData getField:@"last"]];
- nick = [[mutableNick copy] autorelease];
+ nick = [mutableNick copy]; } else if (nick == nil) {
nick = @"Unnamed contact";
@@ -712,13 +704,12 @@
NSString *dnsname = [NSString stringWithFormat:@"%@%s", contact.uniqueID,"._presence._tcp.local."];
err = DNSServiceQueryRecord( &serviceRef, (DNSServiceFlags) 0, interface, [dnsname UTF8String],
- kDNSServiceType_NULL, kDNSServiceClass_IN, ImageQueryRecordReply, contact);
+ kDNSServiceType_NULL, kDNSServiceClass_IN, ImageQueryRecordReply, (__bridge void *)contact); if ( err == kDNSServiceErr_NoError) {
ServiceController *temp = [[ServiceController alloc] initWithServiceRef:serviceRef forContactManager:self];
AILogWithSignature(@"requesting image with %@", temp);
[contact setImageServiceController:temp];
[[contact imageServiceController] addToCurrentRunLoop];
[contact setImageHash: NULL];
[[client client] reportError:@"Error finding image for contact" ofLevel:AWEzvError];
@@ -753,8 +744,7 @@
- (void)setInstanceName:(NSString *)newName
if (avInstanceName != newName) {
- [avInstanceName release];
- avInstanceName = [newName retain];
+ avInstanceName = newName; @@ -805,7 +795,7 @@
void register_reply(DNSServiceRef sdRef, DNSServiceFlags flags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context)
- AWEzvContactManager *self = context;
+ AWEzvContactManager *self = (__bridge AWEzvContactManager *)context; [self setInstanceName:[NSString stringWithUTF8String:name]];
[self regCallBack:errorCode];
@@ -820,7 +810,7 @@
if (errorCode != kDNSServiceErr_NoError) {
AWEzvLog(@"error %d registering image record", errorCode);
- AWEzvContactManager *self = context;
+ AWEzvContactManager *self = (__bridge AWEzvContactManager *)context; @@ -843,7 +833,7 @@
// Received a browser reply from DNSServiceBrowse for av, now must handle processing the list of results
if (errorCode == kDNSServiceErr_NoError) {
- AWEzvContactManager *self = context;
+ AWEzvContactManager *self = (__bridge AWEzvContactManager *)context; if (![[self myInstanceName] isEqualToString:[NSString stringWithUTF8String:serviceName]]) {
[self browseResultwithFlags:flags onInterface:interfaceIndex name:serviceName type:regtype domain:replyDomain av:YES];
@@ -872,11 +862,11 @@
if (errorCode == kDNSServiceErr_NoError) {
// Use TXTRecord methods to resolve this
- AWEzvContact *contact = context;
+ AWEzvContact *contact = (__bridge AWEzvContact *)context; AWEzvContactManager *self = [contact manager];
// AWEzvLog(@"Would update contact");
AWEzvRendezvousData *data;
- data = [[[AWEzvRendezvousData alloc] initWithTXTRecordRef:txtRecord length:txtLen] autorelease];
+ data = [[AWEzvRendezvousData alloc] initWithTXTRecordRef:txtRecord length:txtLen]; [self findAddressForContact:contact withHost:[NSString stringWithUTF8String:hosttarget] withInterface:interfaceIndex];
[self updateContact:contact withData:data withHost:[NSString stringWithUTF8String:hosttarget] withInterface:interfaceIndex withPort:ntohs(port) av:YES];
@@ -891,7 +881,7 @@
uint16_t rdlen, const void *rdata, uint32_t ttl, void *context )
// DNSServiceQueryRecord callback used to look up IP addresses.
- AWEzvContact *contact = context;
+ AWEzvContact *contact = (__bridge AWEzvContact *)context; AWEzvContactManager *self = [contact manager];
[self updateAddressForContact:contact addr:rdata addrLen:rdlen host:fullname interfaceIndex:interfaceIndex
@@ -906,7 +896,7 @@
uint16_t rdlen, const void *rdata, uint32_t ttl, void *context)
// DNSServiceQueryRecord callback used to look up buddy icon.
- AWEzvContact *contact = context;
+ AWEzvContact *contact = (__bridge AWEzvContact *)context; AWEzvContactManager *self = [contact manager];
if (errorCode == kDNSServiceErr_NoError) {
if (flags & kDNSServiceFlagsAdd) {
@@ -926,7 +916,7 @@
static void ProcessSockData( CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void *data, void *info)
// CFRunloop callback that notifies dns_sd when new data appears on a DNSServiceRef's socket.
- ServiceController *self = (ServiceController *)info;
+ ServiceController *self = (__bridge ServiceController *)info; AILogWithSignature(@"Processing result for %@", self);
DNSServiceErrorType err = DNSServiceProcessResult([self serviceRef]);
@@ -943,10 +933,8 @@
[[self contactManager] serviceControllerReceivedFatalError:self];
[self breakdownServiceController];
AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %d and data %s\n",
@@ -959,7 +947,7 @@
if ((self = [super init])) {
- contactManager = [inContactManager retain];
+ contactManager = inContactManager; @@ -968,7 +956,7 @@
- (boolean_t) addToCurrentRunLoop
// Add the service to the current runloop. Returns non-zero on success.
- CFSocketContext ctx = { 1, self, NULL, NULL, NULL };
+ CFSocketContext ctx = { 1, (__bridge void *)(self), NULL, NULL, NULL }; fSocketRef = CFSocketCreateWithNative(kCFAllocatorDefault, DNSServiceRefSockFD(fServiceRef),
kCFSocketReadCallBack, ProcessSockData, &ctx);
@@ -1002,8 +990,6 @@
AILogWithSignature(@"%@", self);
[self breakdownServiceController];
- (void)breakdownServiceController
@@ -1030,7 +1016,7 @@
- [contactManager release]; contactManager = nil;
@end // Implementation ServiceController
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Wed Jan 25 14:52:06 2012 -0500
@@ -48,7 +48,7 @@
-(AWEzvRendezvousData *) init
if ((self = [super init])) {
- keys = [[NSMutableDictionary dictionary] retain];
+ keys = [NSMutableDictionary dictionary]; @@ -72,7 +72,6 @@
/* check that the length is ok */
if ([data length] < (sizeof(subn) + 4 + sizeof(endn))) {
AWEzvLog(@"Invalid rendezvous announcement: length %u", [data length]);
@@ -83,7 +82,6 @@
version = ntohl(version);
AWEzvLog(@"Invalid rendezvous announcement: incorrect version: %u", version);
@@ -106,7 +104,6 @@
/* read length of field name */
if ([data length] < i + 2) {
AWEzvLog(@"Invalid rendezvous announcement at field name length");
@@ -119,17 +116,15 @@
if ([data length] < i + fieldLen) {
AWEzvLog(@"Invalid rendezvous announcement at field name");
tmpData = [NSData dataWithBytes:[data bytes] + i length:fieldLen];
- fieldName = [[[NSString alloc] initWithData:tmpData encoding:NSUTF8StringEncoding] autorelease];
+ fieldName = [[NSString alloc] initWithData:tmpData encoding:NSUTF8StringEncoding]; /* read length of field data */
if ([data length] < i + 2) {
AWEzvLog(@"Invalid rendezvous announcement at field data length");
@@ -145,14 +140,13 @@
if ([data length] < i + fieldLen) {
AWEzvLog(@"Invalid rendezvous announcement at field data");
tmpData = [NSData dataWithBytes:[data bytes] + i length:fieldLen];
- fieldContent = [[[NSString alloc] initWithData:tmpData encoding:NSUTF8StringEncoding] autorelease];
+ fieldContent = [[NSString alloc] initWithData:tmpData encoding:NSUTF8StringEncoding]; - fieldContent = [[[NSString alloc] initWithBytes:[data bytes] + i length:fieldLen encoding:NSUTF8StringEncoding] autorelease];
+ fieldContent = [[NSString alloc] initWithBytes:[data bytes] + i length:fieldLen encoding:NSUTF8StringEncoding]; @@ -187,14 +181,12 @@
/* check if there was an error in extraction */
AWEzvLog(@"Unable to extract XML into plist");
/* make sure it's an NSData, or reponds to getBytes:range: */
if (![extracted respondsToSelector:@selector(getBytes:range:)]) {
AWEzvLog(@"Extracted object from XML is not an NSData");
@@ -261,7 +253,7 @@
keyString = [NSString stringWithUTF8String: key];
- data = [[[NSString alloc] initWithBytes: value length: valLen encoding: NSUTF8StringEncoding] autorelease];
+ data = [[NSString alloc] initWithBytes: value length: valLen encoding: NSUTF8StringEncoding]; if (data != NULL && keyString != NULL) {
@@ -298,13 +290,6 @@
-/* deallocate, destroy our dictionary */
/* sets a field in the rendezvous data structures */
-(void) setField:(NSString *)fieldName content:(NSObject *)content {
if (content == nil || fieldName == nil)
@@ -322,7 +307,7 @@
/* get a field from the rendezvous data structure */
-(NSString *) getField:(NSString *)fieldName {
- return [[[keys objectForKey:fieldName] copy] autorelease];
+ return [[keys objectForKey:fieldName] copy]; /* return if a field exists */
@@ -337,7 +322,7 @@
/* return the dictionary */
-(NSDictionary *)dictionary {
- return [[keys copy] autorelease];
@@ -359,7 +344,6 @@
/* allocate NSData to create data in */
data = [[NSMutableData alloc] init];
/* add the subnegotiation string */
[data appendBytes:subn length:sizeof(subn)];
[data appendBytes:&serialBE length:4];
@@ -414,11 +398,10 @@
format:NSPropertyListXMLFormat_v1_0
errorDescription:&error];
infoData = [[NSMutableString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding];
- [infoData autorelease];
/* and now we have the rendezvous data to return to the caller, the copy
converts it to immutable */
- return [[infoData copy] autorelease];
+ return [infoData copy]; @@ -426,7 +409,7 @@
* We add an ASCII 1 character every 255 characters for pascal string separation
-(NSString *)dataAsDNSTXT {
- NSMutableString *infoData = [[[self data] mutableCopy] autorelease]; /* data to be done */
+ NSMutableString *infoData = [[self data] mutableCopy]; /* data to be done */ unsigned long i; /* loop counter */
/* add the character \001 when we exceed 255 characters, required to allow announcement
@@ -437,7 +420,7 @@
/* return a copy so it is immutable */
- return [[infoData copy] autorelease];
+ return [infoData copy]; /* ichat AV style TXT record */
@@ -583,7 +566,7 @@
/* return copy so it is immutable */
- return [[data copy] autorelease];
/* ichat AV style TXT record */
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Wed Jan 25 14:52:06 2012 -0500
@@ -134,7 +134,6 @@
@implementation AsyncReadPacket
@@ -148,7 +147,7 @@
if ((self = [super init]))
readAllAvailableData = a;
@@ -158,13 +157,6 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -180,7 +172,6 @@
- (id)initWithData:(NSData *)d timeout:(NSTimeInterval)t tag:(long)i;
@implementation AsyncWritePacket
@@ -189,7 +180,7 @@
if ((self = [super init]))
@@ -197,12 +188,6 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -251,7 +236,7 @@
NSAssert (sizeof(CFSocketContext) == sizeof(CFStreamClientContext), @"CFSocketContext and CFStreamClientContext aren't the same size anymore. Contact the developer.");
- theContext.info = self;
+ theContext.info = (__bridge void *)(self); theContext.release = nil;
theContext.copyDescription = nil;
@@ -263,11 +248,8 @@
- [theReadQueue release];
- [theWriteQueue release];
[NSObject cancelPreviousPerformRequestsWithTarget:theDelegate selector:@selector(onSocketDidDisconnect:) object:self];
[NSObject cancelPreviousPerformRequestsWithTarget:self];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -507,7 +489,7 @@
- err = CFSocketSetAddress (theSocket, (CFDataRef)address);
+ err = CFSocketSetAddress (theSocket, (__bridge CFDataRef)address); if (err != kCFSocketSuccess) goto Failed;
//NSLog(@"theSocket4: %hu", [self localPort:theSocket]);
@@ -526,7 +508,7 @@
- err = CFSocketSetAddress (theSocket6, (CFDataRef)address6);
+ err = CFSocketSetAddress (theSocket6, (__bridge CFDataRef)address6); if (err != kCFSocketSuccess) goto Failed;
//NSLog(@"theSocket6: %hu", [self localPort:theSocket6]);
@@ -741,7 +723,7 @@
// The MyCFSocketCallback method will be called when the connection succeeds or fails
- CFSocketError err = CFSocketConnectToAddress(theSocket, (CFDataRef)remoteAddr, -1);
+ CFSocketError err = CFSocketConnectToAddress(theSocket, (__bridge CFDataRef)remoteAddr, -1); if(err != kCFSocketSuccess)
if (errPtr) *errPtr = [self getSocketError];
@@ -750,7 +732,7 @@
- CFSocketError err = CFSocketConnectToAddress(theSocket6, (CFDataRef)remoteAddr, -1);
+ CFSocketError err = CFSocketConnectToAddress(theSocket6, (__bridge CFDataRef)remoteAddr, -1); if(err != kCFSocketSuccess)
if (errPtr) *errPtr = [self getSocketError];
@@ -767,7 +749,7 @@
- (void)doAcceptWithSocket:(CFSocketNativeHandle)newNative
- AsyncSocket *newSocket = [[[AsyncSocket alloc] initWithDelegate:theDelegate] autorelease];
+ AsyncSocket *newSocket = [[AsyncSocket alloc] initWithDelegate:theDelegate]; NSRunLoop *runLoop = nil;
@@ -874,7 +856,7 @@
- (BOOL)createStreamsToHost:(NSString *)hostname onPort:(UInt16)port error:(NSError **)errPtr
// Create the socket & streams.
- CFStreamCreatePairWithSocketToHost(kCFAllocatorDefault, (CFStringRef)hostname, port, &theReadStream, &theWriteStream);
+ CFStreamCreatePairWithSocketToHost(kCFAllocatorDefault, (__bridge CFStringRef)hostname, port, &theReadStream, &theWriteStream); if (theReadStream == NULL || theWriteStream == NULL)
if (errPtr) *errPtr = [self getStreamError];
@@ -1095,7 +1077,6 @@
- [partialReadBuffer release];
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(disconnect) object:nil];
@@ -1626,7 +1607,7 @@
- return [ms autorelease];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1648,9 +1629,6 @@
[theReadQueue addObject:packet];
[self scheduleDequeueRead];
- (void)readDataToData:(NSData *)data withTimeout:(NSTimeInterval)timeout tag:(long)tag
@@ -1668,9 +1646,6 @@
[theReadQueue addObject:packet];
[self scheduleDequeueRead];
- (void)readDataWithTimeout:(NSTimeInterval)timeout tag:(long)tag
@@ -1687,9 +1662,6 @@
[theReadQueue addObject:packet];
[self scheduleDequeueRead];
@@ -1714,7 +1686,7 @@
// Get new current read AsyncReadPacket.
AsyncReadPacket *newPacket = [theReadQueue objectAtIndex:0];
- theCurrentRead = [newPacket retain];
+ theCurrentRead = newPacket; [theReadQueue removeObjectAtIndex:0];
@@ -1845,7 +1817,6 @@
[theReadTimer invalidate];
- [theCurrentRead release];
@@ -1872,8 +1843,6 @@
[theWriteQueue addObject:packet];
[self scheduleDequeueWrite];
- (void)scheduleDequeueWrite
@@ -1888,7 +1857,7 @@
// Get new current write AsyncWritePacket.
AsyncWritePacket *newPacket = [theWriteQueue objectAtIndex:0];
- theCurrentWrite = [newPacket retain];
+ theCurrentWrite = newPacket; [theWriteQueue removeObjectAtIndex:0];
@@ -1969,7 +1938,6 @@
[theWriteTimer invalidate];
- [theCurrentWrite release];
[self maybeScheduleDisconnect];
@@ -2078,12 +2046,12 @@
static void MyCFSocketCallback (CFSocketRef sref, CFSocketCallBackType type, CFDataRef address, const void *pData, void *pInfo)
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AsyncSocket *sock = [[(AsyncSocket *)pInfo retain] autorelease];
- [sock doCFSocketCallback:type forSocket:sref withAddress:(NSData *)address withData:pData];
+ AsyncSocket *sock = (__bridge AsyncSocket *)pInfo; + [sock doCFSocketCallback:type forSocket:sref withAddress:(__bridge NSData *)address withData:pData];
@@ -2092,12 +2060,12 @@
static void MyCFReadStreamCallback (CFReadStreamRef stream, CFStreamEventType type, void *pInfo)
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AsyncSocket *sock = [[(AsyncSocket *)pInfo retain] autorelease];
+ AsyncSocket *sock = (__bridge AsyncSocket *)pInfo; [sock doCFReadStreamCallback:type forStream:stream];
@@ -2106,12 +2074,12 @@
static void MyCFWriteStreamCallback (CFWriteStreamRef stream, CFStreamEventType type, void *pInfo)
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AsyncSocket *sock = [[(AsyncSocket *)pInfo retain] autorelease];
+ AsyncSocket *sock = (__bridge AsyncSocket *)pInfo; [sock doCFWriteStreamCallback:type forStream:stream];
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Wed Jan 25 14:52:06 2012 -0500
@@ -70,13 +70,6 @@
// Stop the server if it's running
- // Release all instance variables
- [documentRoot release];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -111,7 +104,6 @@
if (![documentRoot isEqual:value])
- [documentRoot release];
documentRoot = [value copy];
@@ -158,8 +150,7 @@
- (void)setTransfer:(EKEzvOutgoingFileTransfer *)newTransfer{
if (transfer !=newTransfer)
- transfer = [newTransfer retain];
+ transfer = newTransfer; - (EKEzvOutgoingFileTransfer *)transfer{
@@ -222,7 +213,6 @@
id newConnection = [[connectionClass alloc] initWithAsyncSocket:newSocket forServer:self];
[connections addObject:newConnection];
- [newConnection release];
@@ -264,7 +254,7 @@
if ((self = [super init]))
// Take over ownership of the socket
- asyncSocket = [newSocket retain];
+ asyncSocket = newSocket; [asyncSocket setDelegate:self];
// Store reference to server
@@ -288,10 +278,7 @@
if (request) CFRelease(request);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -311,13 +298,13 @@
// NSString *requestVersion = [(NSString *)CFHTTPMessageCopyVersion(request) autorelease];
// NSURL *requestURI = [(NSURL *)CFHTTPMessageCopyRequestURL(request) autorelease];
- NSString *encoding = [(NSString *)CFHTTPMessageCopyHeaderFieldValue(request, CFSTR("Accept-Encoding")) autorelease];
+ NSString *encoding = (__bridge_transfer NSString *)CFHTTPMessageCopyHeaderFieldValue(request, CFSTR("Accept-Encoding")); if ([encoding isEqualToString:@"AppleSingle"]) {
- NSString *connection = [(NSString *)CFHTTPMessageCopyHeaderFieldValue(request, CFSTR("Connection")) autorelease];
+ NSString *connection = (__bridge_transfer NSString *)CFHTTPMessageCopyHeaderFieldValue(request, CFSTR("Connection")); if ([connection isEqualToString:@"keep-alive"]) {
@@ -327,14 +314,14 @@
// Check the HTTP version
// If it's anything but HTTP version 1.1, we don't support it
- NSString *version = [(NSString *)CFHTTPMessageCopyVersion(request) autorelease];
+ NSString *version = (__bridge_transfer NSString *)CFHTTPMessageCopyVersion(request); if (!version || ![version isEqualToString:(NSString *)kCFHTTPVersion1_1]) {
//NSLog(@"HTTP Server: Error 505 - Version Not Supported");
// Status Code 505 - Version Not Supported
- CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 505, NULL, (CFStringRef)version);
+ CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 505, NULL, (__bridge CFStringRef)version); CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), CFSTR("0"));
- NSData *responseData = [(NSData *)CFHTTPMessageCopySerializedMessage(response) autorelease];
+ NSData *responseData = (__bridge_transfer NSData *)CFHTTPMessageCopySerializedMessage(response); [asyncSocket writeData:responseData withTimeout:WRITE_ERROR_TIMEOUT tag:HTTP_RESPONSE];
[[server transfer] userFailedDownload];
@@ -343,14 +330,14 @@
// If no method was passed, issue a Bad Request response
- NSString *method = [(NSString *)CFHTTPMessageCopyRequestMethod(request) autorelease];
+ NSString *method = (__bridge_transfer NSString *)CFHTTPMessageCopyRequestMethod(request); //NSLog(@"HTTP Server: Error 400 - Bad Request");
// Status Code 400 - Bad Request
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 400, NULL, kCFHTTPVersion1_1);
CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), CFSTR("0"));
- NSData *responseData = [(NSData *)CFHTTPMessageCopySerializedMessage(response) autorelease];
+ NSData *responseData = (__bridge_transfer NSData *)CFHTTPMessageCopySerializedMessage(response); [asyncSocket writeData:responseData withTimeout:WRITE_ERROR_TIMEOUT tag:HTTP_RESPONSE];
[[server transfer] userFailedDownload];
@@ -358,7 +345,7 @@
- NSURL *uri = [(NSURL *)CFHTTPMessageCopyRequestURL(request) autorelease];
+ NSURL *uri = (__bridge_transfer NSURL *)CFHTTPMessageCopyRequestURL(request); // Respond properly to HTTP 'GET' and 'HEAD' commands
if ([method isEqualToString:@"GET"] || [method isEqualToString:@"HEAD"]) {
@@ -376,7 +363,7 @@
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1);
[self setHeaderFields:response forURI:[uri relativeString] appleSingle: isAppleSingle keepAlive:isKeepAlive];
NSString *contentLength = [NSString stringWithFormat:@"%i", [data length]];
- CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (CFStringRef)contentLength);
+ CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (__bridge CFStringRef)contentLength); //NSDictionary *responseHeaders = [(NSDictionary *)CFHTTPMessageCopyAllHeaderFields(response) autorelease];
// NSLog(@"Sending Headers - %@", responseHeaders);
@@ -386,14 +373,14 @@
// If they issue a 'GET' command, we need to include the file
if ([method isEqual:@"HEAD"])
- NSData *responseData = [(NSData *)CFHTTPMessageCopySerializedMessage(response) autorelease];
+ NSData *responseData = (__bridge_transfer NSData *)CFHTTPMessageCopySerializedMessage(response); [asyncSocket writeData:responseData withTimeout:WRITE_HEAD_TIMEOUT tag:HTTP_RESPONSE];
// Previously, we would use the CFHTTPMessageSetBody method here.
// This caused problems, however, if the data was large.
// For example, if the data represented a 500 MB movie on the disk, this method would thrash the OS!
- NSData *responseData = [(NSData *)CFHTTPMessageCopySerializedMessage(response) autorelease];
+ NSData *responseData = (__bridge_transfer NSData *)CFHTTPMessageCopySerializedMessage(response); [asyncSocket writeData:responseData withTimeout:WRITE_HEAD_TIMEOUT tag:HTTP_PARTIAL_RESPONSE];
[asyncSocket writeData:data withTimeout:WRITE_BODY_TIMEOUT tag:HTTP_RESPONSE];
@@ -406,7 +393,7 @@
// Status code 405 - Method Not Allowed
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 405, NULL, kCFHTTPVersion1_1);
- NSData *responseData = [(NSData *)CFHTTPMessageCopySerializedMessage(response) autorelease];
+ NSData *responseData = (__bridge_transfer NSData *)CFHTTPMessageCopySerializedMessage(response); [asyncSocket writeData:responseData withTimeout:WRITE_ERROR_TIMEOUT tag:HTTP_RESPONSE];
@@ -449,7 +436,6 @@
[data appendData: fileData];
@@ -464,7 +450,7 @@
CFHTTPMessageSetHeaderFieldValue(response,CFSTR("Connection"),CFSTR("close"));
CFHTTPMessageSetHeaderFieldValue(response,CFSTR("Content-Encoding"),CFSTR("AppleSingle"));
- CFHTTPMessageSetHeaderFieldValue(response,CFSTR("Date"),(CFStringRef)[[NSDate date] description]);
+ CFHTTPMessageSetHeaderFieldValue(response,CFSTR("Date"),(__bridge CFStringRef)[[NSDate date] description]); CFHTTPMessageSetHeaderFieldValue(response,CFSTR("Server"),CFSTR("Fez (Mac OS X)"));
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m Wed Jan 25 14:52:06 2012 -0500
@@ -35,6 +35,7 @@
#import <Adium/AIContactHidingController.h>
#import <AIUtilities/AIColorAdditions.h>
#import <AIUtilities/AIStringAdditions.h>
// For the KEY_SHOW_OFFLINE_CONTACTS and PREF_GROUP_CONTACT_LIST_DISPLAY
#import "AIContactController.h"
#import "AIInterfaceController.h"
@@ -54,7 +55,7 @@
- (void)activateAccountList:(id)sender;
- (void)disableStatusItem:(id)sender;
-@property (nonatomic, retain) NSMenuItem *contactsMenuItem;
+@property (nonatomic, strong) NSMenuItem *contactsMenuItem; @implementation CBStatusMenuItemController
@@ -63,14 +64,14 @@
+ (CBStatusMenuItemController *)statusMenuItemController
- return [[[self alloc] init] autorelease];
+ return [[self alloc] init]; if ((self = [super init])) {
//Create and set up the status item
- statusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:25] retain];
+ statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:25]; statusItemView = [[AIStatusItemView alloc] initWithFrame:NSMakeRect(0,0,25,22)];
statusItemView.statusItem = statusItem;
@@ -98,10 +99,10 @@
accountsMenuNeedsUpdate = YES;
optionsMenuNeedsUpdate = YES;
- self.contactsMenuItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Contacts",nil)
+ self.contactsMenuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Contacts",nil) - keyEquivalent:@""] autorelease];
NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
//Register to recieve chat opened and chat closed notifications
@@ -154,16 +155,16 @@
//Register ourself for the status menu items
- statusMenu = [[AIStatusMenu statusMenuWithDelegate:self] retain];
+ statusMenu = [AIStatusMenu statusMenuWithDelegate:self]; - accountMenu = [[AIAccountMenu accountMenuWithDelegate:self
+ accountMenu = [AIAccountMenu accountMenuWithDelegate:self submenuType:AIAccountStatusSubmenu
- showTitleVerbs:YES] retain];
- contactMenu = [[AIContactMenu contactMenuWithDelegate:self
- forContactsInObject:nil] retain];
+ contactMenu = [AIContactMenu contactMenuWithDelegate:self + forContactsInObject:nil]; @@ -182,31 +183,22 @@
[[statusItem statusBar] removeStatusItem:statusItem];
- [statusItemView release];
// All the temporary NSMutableArrays we store
- [accountMenuItemsArray release];
- [stateMenuItemsArray release];
- [openChatsArray release];
- [mainAccountsMenu release];
- [mainOptionsMenu release];
// Release our various menus.
- [accountMenu setDelegate:nil]; [accountMenu release];
- [contactMenu setDelegate:nil]; [contactMenu release];
- [statusMenu setDelegate:nil]; [statusMenu release];
+ [accountMenu setDelegate:nil]; + [contactMenu setDelegate:nil]; + [statusMenu setDelegate:nil]; // Release our AIMenuBarIcons bundle
// Can't release this because it causes a crash on quit. rdar://4139755, rdar://4160625, and #743. --boredzo
//To the superclass, Robin!
@@ -246,7 +238,6 @@
resourceFolderName:RESOURCE_MENU_BAR_ICONS];
menuIcons = [[AIMenuBarIcons alloc] initWithURL:[NSURL fileURLWithPath:menuIconPath]];
@@ -294,7 +285,7 @@
currentlyIgnoringUnviewed = NO;
[unviewedContentFlash invalidate];
- [unviewedContentFlash release]; unviewedContentFlash = nil;
+ unviewedContentFlash = nil; #define IMAGE_TYPE_CONTENT @"Content"
@@ -408,7 +399,7 @@
NSImage *image = duckImage;
- image = [[duckImage copy] autorelease];
+ image = [duckImage copy]; @@ -461,8 +452,7 @@
mainMenuNeedsUpdate = YES;
- [accountMenuItemsArray release];
- accountMenuItemsArray = [menuItems retain];
+ accountMenuItemsArray = menuItems; //We need to update next time we're clicked
accountsMenuNeedsUpdate = YES;
@@ -481,8 +471,7 @@
- (void)statusMenu:(AIStatusMenu *)inStatusMenu didRebuildStatusMenuItems:(NSArray *)menuItemArray
- [stateMenuItemsArray release];
- stateMenuItemsArray = [menuItemArray retain];
+ stateMenuItemsArray = menuItemArray; //We need to update next time we're clicked
mainMenuNeedsUpdate = YES;
@@ -619,19 +608,17 @@
NSUInteger unviewedContentCount = [adium.chatController unviewedContentCount];
- [openChatsArray release];
- openChatsArray = [[adium.interfaceController openChats] retain];
+ openChatsArray = [adium.interfaceController openChats]; // We think there's unviewed content, but there's not.
if (unviewedContent && unviewedContentCount == 0) {
// Invalidate and release the unviewed content flash timer
[unviewedContentFlash invalidate];
- [unviewedContentFlash release]; unviewedContentFlash = nil;
+ unviewedContentFlash = nil; currentlyIgnoringUnviewed = NO;
// Update unviewed content
@@ -644,11 +631,11 @@
// If this particular Xtra wants us to flash unviewed content, start the timer up
currentlyIgnoringUnviewed = NO;
- unviewedContentFlash = [[NSTimer scheduledTimerWithTimeInterval:1.0
+ unviewedContentFlash = [NSTimer scheduledTimerWithTimeInterval:1.0 selector:@selector(updateUnviewedContentFlash:)
// Update unviewed content
@@ -661,9 +648,7 @@
[self updateUnreadCount];
- mainMenuNeedsUpdate = YES;
+ mainMenuNeedsUpdate = YES; #pragma mark Menu Delegates/Actions
@@ -702,7 +687,6 @@
[menuItem setSubmenu:mainAccountsMenu];
menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Options",nil)
@@ -711,7 +695,6 @@
[menuItem setSubmenu:mainOptionsMenu];
[menu addItem:[NSMenuItem separatorItem]];
@@ -755,7 +738,6 @@
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Wed Jan 25 14:52:06 2012 -0500
@@ -121,14 +121,6 @@
[[NSNotificationCenter defaultCenter] removeObserver:self];
[adium.preferenceController unregisterPreferenceObserver:self];
- [twitterEngine release];
- [pendingRequests release];
- [queuedUpdates release];
- [queuedOutgoingDM release];
@@ -154,8 +146,6 @@
- [twitterEngine release];
twitterEngine = [[MGTwitterEngine alloc] initWithDelegate:self];
[twitterEngine setClientName:@"Adium"
@@ -188,8 +178,8 @@
twitterEngine.useOAuth = YES;
- OAToken *token = [[[OAToken alloc] initWithHTTPResponseBody:self.passwordWhileConnected] autorelease];
- OAConsumer *consumer = [[[OAConsumer alloc] initWithKey:self.consumerKey secret:self.secretKey] autorelease];
+ OAToken *token = [[OAToken alloc] initWithHTTPResponseBody:self.passwordWhileConnected]; + OAConsumer *consumer = [[OAConsumer alloc] initWithKey:self.consumerKey secret:self.secretKey]; twitterEngine.accessToken = token;
twitterEngine.consumer = consumer;
@@ -272,7 +262,7 @@
- [twitterEngine release]; twitterEngine = nil;
[updateTimer invalidate]; updateTimer = nil;
@@ -671,27 +661,27 @@
- menuItem = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Open %@'s user page",nil), inContact.UID]
+ menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Open %@'s user page",nil), inContact.UID] action:@selector(openUserPage:)
- keyEquivalent:@""] autorelease];
[menuItem setImage:serviceIcon];
[menuItem setRepresentedObject:inContact];
[menuItemArray addObject:menuItem];
- menuItem = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Enable device notifications for %@", "Enable sending Twitter notifications to your phone (device)"), inContact.UID]
+ menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Enable device notifications for %@", "Enable sending Twitter notifications to your phone (device)"), inContact.UID] action:@selector(enableOrDisableNotifications:)
- keyEquivalent:@""] autorelease];
[menuItem setImage:serviceIcon];
[menuItem setRepresentedObject:inContact];
[menuItemArray addObject:menuItem];
- menuItem = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Disable device notifications for %@", "Disable sending Twitter notifications to your phone"), inContact.UID]
+ menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Disable device notifications for %@", "Disable sending Twitter notifications to your phone"), inContact.UID] action:@selector(enableOrDisableNotifications:)
- keyEquivalent:@""] autorelease];
[menuItem setImage:serviceIcon];
[menuItem setRepresentedObject:inContact];
@@ -778,17 +768,17 @@
- menuItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Update Tweets",nil)
+ menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Update Tweets",nil) action:@selector(periodicUpdate)
- keyEquivalent:@""] autorelease];
[menuItem setImage:serviceIcon];
[menuItemArray addObject:menuItem];
- menuItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Reply to a Tweet",nil)
+ menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Reply to a Tweet",nil) action:@selector(replyToTweet)
- keyEquivalent:@""] autorelease];
[menuItem setImage:serviceIcon];
[menuItemArray addObject:menuItem];
@@ -808,22 +798,22 @@
- menuItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Update Tweets",nil)
+ menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Update Tweets",nil) action:@selector(periodicUpdate)
- keyEquivalent:@""] autorelease];
[menuItemArray addObject:menuItem];
- menuItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Reply to a Tweet",nil)
+ menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Reply to a Tweet",nil) action:@selector(replyToTweet)
- keyEquivalent:@""] autorelease];
[menuItemArray addObject:menuItem];
- menuItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Get Rate Limit Amount",nil)
+ menuItem = [[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Get Rate Limit Amount",nil) action:@selector(getRateLimitAmount)
- keyEquivalent:@""] autorelease];
[menuItemArray addObject:menuItem];
@@ -1413,7 +1403,7 @@
url, NSLinkAttributeName,
className, AIElementClassAttributeName, nil];
- return [[[NSAttributedString alloc] initWithString:label attributes:attributes] autorelease];
+ return [[NSAttributedString alloc] initWithString:label attributes:attributes]; @@ -1427,7 +1417,7 @@
static NSCharacterSet *hashCharacters = nil;
if (!usernameCharacters) {
- usernameCharacters = [[NSCharacterSet characterSetWithCharactersInString:@"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"] retain];
+ usernameCharacters = [NSCharacterSet characterSetWithCharactersInString:@"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"]; @@ -1435,9 +1425,8 @@
[disallowedCharacters formUnionWithCharacterSet:[NSCharacterSet whitespaceCharacterSet]];
[disallowedCharacters removeCharactersInString:@"_"];
- hashCharacters = [[disallowedCharacters invertedSet] retain];
+ hashCharacters = [disallowedCharacters invertedSet]; - [disallowedCharacters release];
attributedString = [AITwitterURLParser linkifiedStringFromAttributedString:inString
@@ -1474,7 +1463,7 @@
BOOL tweetLink = (tweetID.length && userID.length);
if (replyTweet || tweetLink) {
- NSMutableAttributedString *mutableMessage = [[message mutableCopy] autorelease];
+ NSMutableAttributedString *mutableMessage = [message mutableCopy]; NSUInteger startIndex = message.length;
@@ -1628,7 +1617,7 @@
message = [self linkifiedAttributedStringFromString:message];
- NSMutableAttributedString *mutableMessage = [[message mutableCopy] autorelease];
+ NSMutableAttributedString *mutableMessage = [message mutableCopy]; NSUInteger startIndex = message.length;
@@ -1695,7 +1684,7 @@
- return [mutableArray autorelease];
@@ -1777,7 +1766,7 @@
[queuedUpdates removeAllObjects];
} else if (requestType == AITwitterUpdateDirectMessage || requestType == AITwitterDirectMessageSend) {
- NSMutableArray **unsortedArray = (requestType == AITwitterUpdateDirectMessage) ? &queuedDM : &queuedOutgoingDM;
+ NSMutableArray * __strong *unsortedArray = (requestType == AITwitterUpdateDirectMessage) ? &queuedDM : &queuedOutgoingDM; if (!(*unsortedArray).count) {
@@ -2140,10 +2129,10 @@
if([self requestTypeForRequestID:identifier] == AITwitterUpdateFollowedTimeline) {
followedTimelineCompleted = YES;
- futureTimelineLastID = [largestTweet retain];
+ futureTimelineLastID = largestTweet; } else if ([self requestTypeForRequestID:identifier] == AITwitterUpdateReplies) {
- futureRepliesLastID = [largestTweet retain];
+ futureRepliesLastID = largestTweet; @@ -2160,7 +2149,7 @@
forKey:TWITTER_PREFERENCE_REPLIES_LAST_ID
group:TWITTER_PREFERENCE_GROUP_UPDATES];
- [futureRepliesLastID release]; futureRepliesLastID = nil;
+ futureRepliesLastID = nil; if(futureTimelineLastID) {
@@ -2170,7 +2159,7 @@
forKey:TWITTER_PREFERENCE_TIMELINE_LAST_ID
group:TWITTER_PREFERENCE_GROUP_UPDATES];
- [futureTimelineLastID release]; futureTimelineLastID = nil;
+ futureTimelineLastID = nil; [self displayQueuedUpdatesForRequestType:[self requestTypeForRequestID:identifier]];
@@ -2186,7 +2175,7 @@
} else if ([self requestTypeForRequestID:identifier] == AITwitterProfileStatusUpdates) {
AIListContact *listContact = [[self dictionaryForRequestID:identifier] objectForKey:@"ListContact"];
- NSMutableArray *profileArray = [[[listContact profileArray] mutableCopy] autorelease];
+ NSMutableArray *profileArray = [[listContact profileArray] mutableCopy]; AILogWithSignature(@"%@ Updating statuses for profile, user %@", self, listContact);
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m Wed Jan 25 14:52:06 2012 -0500
@@ -109,7 +109,7 @@
+ (AIWebKitMessageViewController *)messageDisplayControllerForChat:(AIChat *)inChat withPlugin:(AIWebKitMessageViewPlugin *)inPlugin
- return [[[self alloc] initForChat:inChat withPlugin:inPlugin] autorelease];
+ return [[self alloc] initForChat:inChat withPlugin:inPlugin]; - (id)initForChat:(AIChat *)inChat withPlugin:(AIWebKitMessageViewPlugin *)inPlugin
@@ -120,8 +120,8 @@
delegateProxy = [AIWebKitDelegate sharedWebKitDelegate];
- chat = [inChat retain];
- plugin = [inPlugin retain];
contentQueue = [[NSMutableArray alloc] init];
objectIconPathDict = [[NSMutableDictionary alloc] init];
objectsWithUserIconsArray = [[NSMutableArray alloc] init];
@@ -190,7 +190,7 @@
[[webView windowScriptObject] removeWebScriptKey:@"client"];
- [webView release]; webView = nil;
@@ -200,9 +200,9 @@
[self releaseAllCachedIcons];
- [plugin release]; plugin = nil;
- [objectsWithUserIconsArray release]; objectsWithUserIconsArray = nil;
- [objectIconPathDict release]; objectIconPathDict = nil;
+ objectsWithUserIconsArray = nil; + objectIconPathDict = nil; //Stop any delayed requests and remove all observers
[NSObject cancelPreviousPerformRequestsWithTarget:self];
@@ -210,22 +210,16 @@
[[NSNotificationCenter defaultCenter] removeObserver:self];
//Clean up style/variant info
- [messageStyle release]; messageStyle = nil;
- [activeStyle release]; activeStyle = nil;
- [preferenceGroup release]; preferenceGroup = nil;
//Cleanup content processing
- [contentQueue release]; contentQueue = nil;
- [storedContentObjects release]; storedContentObjects = nil;
- [previousContent release]; previousContent = nil;
+ storedContentObjects = nil; - [chat release]; chat = nil;
- //Release the marked scroller
- [self.markedScroller release];
- (void)setShouldReflectPreferenceChanges:(BOOL)inValue
@@ -238,7 +232,7 @@
storedContentObjects = [[NSMutableArray alloc] init];
- [storedContentObjects release]; storedContentObjects = nil;
+ storedContentObjects = nil; @@ -355,15 +349,15 @@
isUpdatingWebViewForCurrentPreferences = YES;
dispatch_sync(webViewUpdateQueue, ^{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- [messageStyle autorelease]; messageStyle = nil;
- [activeStyle release]; activeStyle = nil;
- messageStyle = [[plugin currentMessageStyleForChat:chat] retain];
- activeStyle = [[[messageStyle bundle] bundleIdentifier] retain];
- preferenceGroup = [[plugin preferenceGroupForChat:chat] retain];
+ messageStyle = [plugin currentMessageStyleForChat:chat]; + activeStyle = [[messageStyle bundle] bundleIdentifier]; + preferenceGroup = [plugin preferenceGroupForChat:chat]; [webView setPreferencesIdentifier:[NSString stringWithFormat:@"%@-%@",
activeStyle, preferenceGroup]];
@@ -465,7 +459,7 @@
//Prime the webview with the new style/variant and settings, and re-insert all our content back into the view
[self _primeWebViewAndReprocessContent:YES];
isUpdatingWebViewForCurrentPreferences = NO;
@@ -492,7 +486,6 @@
[self _primeWebViewAndReprocessContent:NO];
[self.markedScroller removeAllMarks];
- [previousContent release];
nextMessageRegainedFocus = NO;
@@ -541,11 +534,10 @@
//Add the old content queue back in if necessary
if (currentContentQueue) {
[contentQueue addObjectsFromArray:currentContentQueue];
- [currentContentQueue release];
//We're still holding onto the previousContent from before, which is no longer accurate. Release it.
- [previousContent release]; previousContent = nil;
@@ -557,7 +549,7 @@
- (void) setIsGroupChat:(BOOL) flag
DOMHTMLElement *chatElement = (DOMHTMLElement *)[[webView mainFrameDocument] getElementById:@"Chat"];
- NSMutableString *chatClassName = [[[chatElement className] mutableCopy] autorelease];
+ NSMutableString *chatClassName = [[chatElement className] mutableCopy]; [chatClassName replaceOccurrencesOfString:@" groupchat"
@@ -606,7 +598,7 @@
- (void)processQueuedContent
dispatch_async(dispatch_get_main_queue(), ^{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
/* If the webview isn't ready, assume we have at least one piece of content left to display */
NSUInteger contentQueueCount = 1;
NSUInteger objectsAdded = 0;
@@ -653,7 +645,7 @@
[self processQueuedContent];
@@ -674,16 +666,15 @@
__block NSString *dateMessage;
[NSDateFormatter withLocalizedDateFormatterPerform:^(NSDateFormatter *dateFormatter){
- dateMessage = [[dateFormatter stringFromDate:content.date] retain];
+ dateMessage = [dateFormatter stringFromDate:content.date]; - [dateMessage autorelease];
dateSeparator = [AIContentEvent statusInChat:content.chat
withSource:content.chat.listObject
destination:content.chat.account
- message:[[[NSAttributedString alloc] initWithString:dateMessage
- attributes:[adium.contentController defaultFormattingAttributes]] autorelease]
+ message:[[NSAttributedString alloc] initWithString:dateMessage + attributes:[adium.contentController defaultFormattingAttributes]] withType:@"date_separator"];
if ([content isKindOfClass:[AIContentContext class]])
@@ -694,7 +685,7 @@
willAddMoreContentObjects:YES
- [previousContent release]; previousContent = [dateSeparator retain];
+ previousContent = dateSeparator; BOOL similar = (previousContent && [content isSimilarToContent:previousContent] && ![content isKindOfClass:[ESFileTransfer class]]);
@@ -748,8 +739,6 @@
[classes removeObject:@"lastFocus"];
node.className = [classes componentsJoinedByString:@" "];
@@ -772,7 +761,7 @@
replaceLastContent:replaceLastContent];
- [previousContent release]; previousContent = [content retain];
+ previousContent = content; @@ -852,7 +841,7 @@
- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
- NSMutableArray *webViewMenuItems = [[defaultMenuItems mutableCopy] autorelease];
+ NSMutableArray *webViewMenuItems = [defaultMenuItems mutableCopy]; AIListContact *chatListObject = chat.listObject.parentContact;
@@ -890,14 +879,12 @@
representedObject:imageURL];
[webViewMenuItems addObject:menuItem];
menuItem = [[NSMenuItem alloc] initWithTitle:[AILocalizedString(@"Save Image As", nil) stringByAppendingEllipsis]
action:@selector(saveImageAs:)
representedObject:imageURL];
[webViewMenuItems addObject:menuItem];
NSString *imgClass = [img className];
@@ -967,7 +954,6 @@
action:@selector(clearView)
[webViewMenuItems addObject:menuItem];
@@ -1143,7 +1129,7 @@
//Remove the cache for any object no longer in the chat
- for (AIListObject *listObject in [[objectsWithUserIconsArray copy] autorelease]) {
+ for (AIListObject *listObject in [objectsWithUserIconsArray copy]) { if ((![listObject isKindOfClass:[AIMetaContact class]] || (![participatingListObjects firstObjectCommonWithArray:[(AIMetaContact *)listObject containedObjects]])) &&
(![listObject isKindOfClass:[AIListContact class]] || ![participatingListObjects containsObjectIdenticalTo:(AIListContact *)listObject]) &&
!(listObject == chat.account)) {
@@ -1269,7 +1255,7 @@
- (void)releaseAllCachedIcons
- for (AIListObject *listObject in [[objectsWithUserIconsArray copy] autorelease]) {
+ for (AIListObject *listObject in [objectsWithUserIconsArray copy]) { [self releaseCurrentWebKitUserIconForObject:listObject];
@@ -1295,7 +1281,7 @@
//If that's not the case, try using the UserIconPath
NSString *userIconPath = [iconSourceObject valueForProperty:@"UserIconPath"];
- userIcon = [[[NSImage alloc] initWithContentsOfFile:userIconPath] autorelease];
+ userIcon = [[NSImage alloc] initWithContentsOfFile:userIconPath]; @@ -1303,7 +1289,7 @@
//Apply the mask if the style has one
AILogWithSignature(@"Masking %@'s icon", inObject);
//XXX Using multiple styles at once, one of which has a user icon mask, would lead to odd behavior
- webKitUserIcon = [[[messageStyle userIconMask] copy] autorelease];
+ webKitUserIcon = [[messageStyle userIconMask] copy]; [webKitUserIcon lockFocus];
[userIcon drawInRect:NSMakeRect(0,0,[webKitUserIcon size].width,[webKitUserIcon size].height)
fromRect:NSMakeRect(0,0,[userIcon size].width,[userIcon size].height)
@@ -1524,7 +1510,7 @@
if( scroller && ! [scroller isMemberOfClass:[JVMarkedScroller class]] ) {
NSRect scrollerFrame = [[scrollView verticalScroller] frame];
NSScroller *oldScroller = scroller;
- scroller = [[[JVMarkedScroller alloc] initWithFrame:scrollerFrame] autorelease];
+ scroller = [[JVMarkedScroller alloc] initWithFrame:scrollerFrame]; [scroller setFloatValue:oldScroller.floatValue];
[scroller setKnobProportion:oldScroller.knobProportion];
[scrollView setVerticalScroller:scroller];
@@ -1565,8 +1551,6 @@
[classes removeObject:@"lastFocus"];
node.className = [classes componentsJoinedByString:@" "];
// Also remove .regainedFocus. By definition this should _not_ have class .focus too, so make a new list
@@ -1580,8 +1564,6 @@
[classes removeObject:@"regainedFocus"];
node.className = [classes componentsJoinedByString:@" "];
@@ -1656,7 +1638,7 @@
- (BOOL)zoomImage:(DOMHTMLImageElement *)img
- NSMutableString *className = [[[img className] mutableCopy] autorelease];
+ NSMutableString *className = [[img className] mutableCopy]; if ([className rangeOfString:@"fullSizeImage"].location != NSNotFound)
[className replaceOccurrencesOfString:@"fullSizeImage"
withString:@"scaledToFitImage"
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Wed Jan 25 10:44:25 2012 -0500
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Wed Jan 25 14:52:06 2012 -0500
@@ -128,14 +128,14 @@
+ (id)messageViewStyleFromBundle:(NSBundle *)inBundle
- return [[[self alloc] initWithBundle:inBundle] autorelease];
+ return [[self alloc] initWithBundle:inBundle]; + (id)messageViewStyleFromPath:(NSString *)path
NSBundle *styleBundle = [NSBundle bundleWithPath:[path stringByExpandingBundlePath]];
- return [[[self alloc] initWithBundle:styleBundle] autorelease];
+ return [[self alloc] initWithBundle:styleBundle]; @@ -145,11 +145,10 @@
- (id)initWithBundle:(NSBundle *)inBundle
if ((self = [super init])) {
- styleBundle = [inBundle retain];
- stylePath = [[styleBundle resourcePath] retain];
+ styleBundle = inBundle; + stylePath = [styleBundle resourcePath]; if ([self reloadStyle] == FALSE) {
@@ -218,26 +217,26 @@
- [contentInHTML release];
- [nextContentInHTML release];
- [contextInHTML release];
- [nextContextInHTML release];
- [contentOutHTML release];
- [nextContentOutHTML release];
- [contextOutHTML release];
- [nextContextOutHTML release];
- [fileTransferHTML release];
- [customBackgroundPath release];
- [customBackgroundColor release];
+ nextContentInHTML = nil; + nextContextInHTML = nil; + nextContentOutHTML = nil; + nextContextOutHTML = nil; + fileTransferHTML = nil; - [userIconMask release];
+ customBackgroundPath = nil; + customBackgroundColor = nil; @@ -245,20 +244,9 @@
- [timeStampFormatter release];
[[NSDistributedNotificationCenter defaultCenter] removeObserver: self];
- [statusIconPathCache release];
- [timeFormatterCache release];
- self.activeVariant = nil;
@synthesize bundle = styleBundle;
@@ -279,7 +267,7 @@
NSString *senderColorsFile = [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL];
- validSenderColors = [[senderColorsFile componentsSeparatedByString:@":"] retain];
+ validSenderColors = [senderColorsFile componentsSeparatedByString:@":"]; checkedSenderColors = YES;
@@ -329,8 +317,6 @@
format = [NSDateFormatter localizedDateFormatStringShowingSeconds:NO showingAMorPM:NO];
- [timeStampFormatter release];
if ([format rangeOfString:@"%"].location != NSNotFound) {
/* Support strftime-style format strings, which old message styles may use */
timeStampFormatter = [[NSDateFormatter alloc] initWithDateFormat:format allowNaturalLanguage:NO];
@@ -404,7 +390,7 @@
} else if([[content type] isEqualToString:CONTENT_FILE_TRANSFER_TYPE]) {
- template = [[fileTransferHTML mutableCopy] autorelease];
+ template = [fileTransferHTML mutableCopy]; } else if ([[content type] isEqualToString:CONTENT_TOPIC_TYPE]) {
@@ -422,7 +408,7 @@
[self fillKeywords:mutableTemplate forContent:content similar:contentIsSimilar];
- return [mutableTemplate autorelease];
+ return mutableTemplate; @@ -435,9 +421,9 @@
//Load the style's templates
//We can't use NSString's initWithContentsOfFile here. HTML files are interpreted in the defaultCEncoding
//(which varies by system) when read that way. We want to always interpret the files as UTF8.
- headerHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Header" ofType:@"html"]] retain];
- footerHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Footer" ofType:@"html"]] retain];
- topicHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Topic" ofType:@"html"]] retain];
+ headerHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Header" ofType:@"html"]]; + footerHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Footer" ofType:@"html"]]; + topicHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Topic" ofType:@"html"]]; baseHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Template" ofType:@"html"]];
//Starting with version 1, styles can choose to not include template.html. If the template is not included
@@ -454,7 +440,7 @@
* clicking works once, then the text doesn't allow a return click. This is an improvement compared
* to fully broken behavior in which the return click shows a missing-image placeholder.
- NSMutableString *imageSwapFixedBaseHTML = [[baseHTML mutableCopy] autorelease];
+ NSMutableString *imageSwapFixedBaseHTML = [baseHTML mutableCopy]; [imageSwapFixedBaseHTML replaceOccurrencesOfString:
@" function imageCheck() {\n"
" node = event.target;\n"
@@ -525,48 +511,47 @@
- contentHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Content" ofType:@"html"]] retain];
- contentInHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Content" ofType:@"html" inDirectory:@"Incoming"]] retain];
- nextContentInHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContent" ofType:@"html" inDirectory:@"Incoming"]] retain];
- contentOutHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Content" ofType:@"html" inDirectory:@"Outgoing"]] retain];
- nextContentOutHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContent" ofType:@"html" inDirectory:@"Outgoing"]] retain];
+ contentHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Content" ofType:@"html"]]; + contentInHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Content" ofType:@"html" inDirectory:@"Incoming"]]; + nextContentInHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContent" ofType:@"html" inDirectory:@"Incoming"]]; + contentOutHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Content" ofType:@"html" inDirectory:@"Outgoing"]]; + nextContentOutHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContent" ofType:@"html" inDirectory:@"Outgoing"]]; - contextInHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Context" ofType:@"html" inDirectory:@"Incoming"]] retain];
- nextContextInHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContext" ofType:@"html" inDirectory:@"Incoming"]] retain];
- contextOutHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Context" ofType:@"html" inDirectory:@"Outgoing"]] retain];
- nextContextOutHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContext" ofType:@"html" inDirectory:@"Outgoing"]] retain];
+ contextInHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Context" ofType:@"html" inDirectory:@"Incoming"]]; + nextContextInHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContext" ofType:@"html" inDirectory:@"Incoming"]]; + contextOutHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Context" ofType:@"html" inDirectory:@"Outgoing"]]; + nextContextOutHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"NextContext" ofType:@"html" inDirectory:@"Outgoing"]]; //Fall back to Resources/Content.html if Incoming isn't present
- if (!contentInHTML) contentInHTML = [contentHTML retain];
+ if (!contentInHTML) contentInHTML = contentHTML; //Fall back to Content if NextContent doesn't need to use different HTML
- if (!nextContentInHTML) nextContentInHTML = [contentInHTML retain];
+ if (!nextContentInHTML) nextContentInHTML = contentInHTML; //Fall back to Content if Context isn't present
- if (!nextContextInHTML) nextContextInHTML = [nextContentInHTML retain];
- if (!contextInHTML) contextInHTML = [contentInHTML retain];
+ if (!nextContextInHTML) nextContextInHTML = nextContentInHTML; + if (!contextInHTML) contextInHTML = contentInHTML; //Fall back to Content if Context isn't present
- if (!nextContextOutHTML && nextContentOutHTML) nextContextOutHTML = [nextContentOutHTML retain];
- if (!contextOutHTML && contentOutHTML) contextOutHTML = [contentOutHTML retain];
+ if (!nextContextOutHTML && nextContentOutHTML) nextContextOutHTML = nextContentOutHTML; + if (!contextOutHTML && contentOutHTML) contextOutHTML = contentOutHTML; //Fall back to Content if Context isn't present
- if (!nextContextOutHTML) nextContextOutHTML = [nextContextInHTML retain];
- if (!contextOutHTML) contextOutHTML = [contextInHTML retain];
+ if (!nextContextOutHTML) nextContextOutHTML = nextContextInHTML; + if (!contextOutHTML) contextOutHTML = contextInHTML; //Fall back to Incoming if Outgoing doesn't need to be different
- if (!contentOutHTML) contentOutHTML = [contentInHTML retain];
- if (!nextContentOutHTML) nextContentOutHTML = [nextContentInHTML retain];
+ if (!contentOutHTML) contentOutHTML = contentInHTML; + if (!nextContentOutHTML) nextContentOutHTML = nextContentInHTML; - statusHTML = [[NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Status" ofType:@"html"]] retain];
+ statusHTML = [NSString stringWithContentsOfUTF8File:[styleBundle semiCaseInsensitivePathForResource:@"Status" ofType:@"html"]]; //Fall back to Resources/Incoming/Content.html if Status isn't present
- if (!statusHTML) statusHTML = [contentInHTML retain];
+ if (!statusHTML) statusHTML = contentInHTML; //TODO: make a generic Request message, rather than having this ft specific one
NSMutableString *fileTransferHTMLTemplate;
@@ -591,7 +576,7 @@
if (!combineConsecutive) contentIsSimilar = NO;
//Fetch the correct template and substitute keywords for the passed content
- newHTML = [[[self completedTemplateForContent:content similar:contentIsSimilar] mutableCopy] autorelease];
+ newHTML = [[self completedTemplateForContent:content similar:contentIsSimilar] mutableCopy]; //BOM scripts vary by style version
if (!usingCustomTemplateHTML && styleVersion >= 4) {
@@ -773,9 +758,8 @@
__block NSString *shortTimeString;
[NSDateFormatter withLocalizedDateFormatterShowingSeconds:NO showingAMorPM:NO perform:^(NSDateFormatter *dateFormatter){
- shortTimeString = (date ? [[dateFormatter stringFromDate:date] retain] : @"");
+ shortTimeString = (date ? [dateFormatter stringFromDate:date] : @""); - [shortTimeString autorelease];
[inString replaceKeyword:@"%shortTime%"
withString:shortTimeString];
@@ -857,7 +841,6 @@
[dateFormatter setDateFormat:timeFormat];
[timeFormatterCache setObject:dateFormatter forKey:timeFormat];
- [dateFormatter release];
[inString safeReplaceCharactersInRange:NSUnionRange(range, endRange)
@@ -1279,8 +1262,6 @@
[inString safeReplaceCharactersInRange:NSUnionRange(range, endRange)
withString:[dateFormatter stringFromDate:[chat dateOpened]]];
- [dateFormatter release];
} while (range.location != NSNotFound);
@@ -1298,7 +1279,7 @@
NSMutableString *bodyTag = nil;
if (allowsCustomBackground && (customBackgroundPath || customBackgroundColor)) {
- bodyTag = [[[NSMutableString alloc] init] autorelease];
+ bodyTag = [[NSMutableString alloc] init]; if (customBackgroundPath) {
if ([customBackgroundPath length]) {