adium 4776:b81fc773551e: ARC-ify libpurple framework.
commits at adium.im
commits at adium.im
Wed Apr 25 03:11:16 UTC 2012
details: http://hg.adium.im/adium/rev/b81fc773551e
revision: 4776:b81fc773551e
branch: ARC
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 24 23:01:38 2012 -0400
ARC-ify libpurple framework.
Subject: adium 4777:59ce4d7fceb3: ARC-ify Adium Framework.
details: http://hg.adium.im/adium/rev/59ce4d7fceb3
revision: 4777:59ce4d7fceb3
branch: ARC
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 24 23:03:33 2012 -0400
ARC-ify Adium Framework.
Subject: adium 4778:34872b5f5a2c: Fix some property declarations that need to be strong.
details: http://hg.adium.im/adium/rev/34872b5f5a2c
revision: 4778:34872b5f5a2c
branch: ARC
author: Frank Dowsett <wixardy at adium.im>
date: Tue Apr 24 23:05:07 2012 -0400
Fix some property declarations that need to be strong.
diffs (truncated from 9194 to 1000 lines):
diff -r 0ae4370b9d77 -r 34872b5f5a2c Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Mon Apr 23 10:39:43 2012 -0400
+++ b/Adium.xcodeproj/project.pbxproj Tue Apr 24 23:05:07 2012 -0400
@@ -130,7 +130,7 @@
1164A9270F7AD70700110AE4 /* AIContentTopic.m in Sources */ = {isa = PBXBuildFile; fileRef = 1164A90C0F7AD4AB00110AE4 /* AIContentTopic.m */; };
116E369A10B72934002EDB0F /* Growl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9A8CB2104DEBC400F210CC /* Growl.framework */; };
116E373310B729E9002EDB0F /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9A8CB2104DEBC400F210CC /* Growl.framework */; };
- 117009A70F7E7D720078D6AB /* AIIRCServicesPasswordPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 117009A10F7E7D3A0078D6AB /* AIIRCServicesPasswordPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 117009A70F7E7D720078D6AB /* AIIRCServicesPasswordPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 117009A10F7E7D3A0078D6AB /* AIIRCServicesPasswordPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
11700A350F7E8BE80078D6AB /* AISpecialPasswordPromptController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11700A340F7E8BE80078D6AB /* AISpecialPasswordPromptController.m */; settings = {COMPILER_FLAGS = ""; }; };
11700A440F7E8CB60078D6AB /* AISpecialPasswordPrompt.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11700A430F7E8CB60078D6AB /* AISpecialPasswordPrompt.nib */; };
1172FBCB0CDAA8D400B8E233 /* libglib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC30CDAA8D400B8E233 /* libglib.framework */; };
@@ -155,7 +155,7 @@
118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
1192E6D90FD3056F003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1192E6B10FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h */; };
- 1192E6DA0FD30578003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 1192E6DA0FD30578003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */; };
1199AB0610BE13E600646322 /* Authorize.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0310BE13E600646322 /* Authorize.tiff */; };
1199AB0710BE13E600646322 /* Deny.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1199AB0410BE13E600646322 /* Deny.tiff */; };
@@ -180,10 +180,10 @@
11D9156F0FFC0FEB00B39713 /* AIImageShackImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11D915580FFC0E9C00B39713 /* AIImageShackImageUploader.m */; };
11D915720FFC100700B39713 /* AIGenericMultipartImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11D915710FFC100700B39713 /* AIGenericMultipartImageUploader.m */; settings = {COMPILER_FLAGS = ""; }; };
11E786810F8860210014612E /* AIJumpControlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11E7867F0F8860210014612E /* AIJumpControlPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
- 11EE1B4D0CDCFAF40097F246 /* oscar-adium.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B490CDCFAF40097F246 /* oscar-adium.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 11EE1B4D0CDCFAF40097F246 /* oscar-adium.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B490CDCFAF40097F246 /* oscar-adium.c */; settings = {COMPILER_FLAGS = ""; }; };
11EE1B4E0CDCFAF40097F246 /* oscar-adium.h in Headers */ = {isa = PBXBuildFile; fileRef = 11EE1B4A0CDCFAF40097F246 /* oscar-adium.h */; };
- 11EE1B4F0CDCFAF40097F246 /* ssl-openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B4B0CDCFAF40097F246 /* ssl-openssl.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 11EE1B500CDCFAF40097F246 /* ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B4C0CDCFAF40097F246 /* ssl.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 11EE1B4F0CDCFAF40097F246 /* ssl-openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B4B0CDCFAF40097F246 /* ssl-openssl.c */; settings = {COMPILER_FLAGS = ""; }; };
+ 11EE1B500CDCFAF40097F246 /* ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 11EE1B4C0CDCFAF40097F246 /* ssl.c */; settings = {COMPILER_FLAGS = ""; }; };
11EE1CCF0CDD01120097F246 /* libglib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC30CDAA8D400B8E233 /* libglib.framework */; };
11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC40CDAA8D400B8E233 /* libgmodule.framework */; };
11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC50CDAA8D400B8E233 /* libgobject.framework */; };
@@ -307,7 +307,7 @@
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 = ""; }; };
344499E90B23CA5D0054B761 /* adiumPurpleAccounts.h in Headers */ = {isa = PBXBuildFile; fileRef = 344499E70B23CA5D0054B761 /* adiumPurpleAccounts.h */; };
- 344499EA0B23CA5D0054B761 /* adiumPurpleAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 344499E80B23CA5D0054B761 /* adiumPurpleAccounts.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 344499EA0B23CA5D0054B761 /* adiumPurpleAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 344499E80B23CA5D0054B761 /* adiumPurpleAccounts.m */; settings = {COMPILER_FLAGS = ""; }; };
344838690BC85EF70083723B /* AccountListPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4B8C3CE80825F60B004B9F45 /* AccountListPreferences.nib */; };
344838B50BC860770083723B /* AIAccountListPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8C3C980825EAF9004B9F45 /* AIAccountListPreferences.m */; };
344839380BC862780083723B /* pref-messages.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336707CBD807006466F2 /* pref-messages.tiff */; };
@@ -408,39 +408,39 @@
3485D8EA09EB446900232CC4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
3485D8EB09EB446900232CC4 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
3485DB1809EBCE6500232CC4 /* SLPurpleCocoaAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34048AC50617CB4C004D0B7E /* SLPurpleCocoaAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB1909EBCE6500232CC4 /* SLPurpleCocoaAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34048AC60617CB4C004D0B7E /* SLPurpleCocoaAdapter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB1909EBCE6500232CC4 /* SLPurpleCocoaAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34048AC60617CB4C004D0B7E /* SLPurpleCocoaAdapter.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB1A09EBCE6500232CC4 /* adiumPurpleBlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE10907A2EE3700663CC9 /* adiumPurpleBlist.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB1B09EBCE6500232CC4 /* adiumPurpleBlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE10A07A2EE3700663CC9 /* adiumPurpleBlist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB1B09EBCE6500232CC4 /* adiumPurpleBlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE10A07A2EE3700663CC9 /* adiumPurpleBlist.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB1C09EBCE6500232CC4 /* adiumPurpleConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE0E907A2ECCF00663CC9 /* adiumPurpleConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB1D09EBCE6500232CC4 /* adiumPurpleConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE0EA07A2ECD000663CC9 /* adiumPurpleConnection.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB1D09EBCE6500232CC4 /* adiumPurpleConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE0EA07A2ECD000663CC9 /* adiumPurpleConnection.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB1E09EBCE6500232CC4 /* adiumPurpleConversation.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE17E07A2F10400663CC9 /* adiumPurpleConversation.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB1F09EBCE6500232CC4 /* adiumPurpleConversation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE17F07A2F10400663CC9 /* adiumPurpleConversation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB1F09EBCE6500232CC4 /* adiumPurpleConversation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE17F07A2F10400663CC9 /* adiumPurpleConversation.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2009EBCE6500232CC4 /* adiumPurpleCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE1B207A2F36400663CC9 /* adiumPurpleCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2109EBCE6500232CC4 /* adiumPurpleCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE1B307A2F36400663CC9 /* adiumPurpleCore.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2109EBCE6500232CC4 /* adiumPurpleCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE1B307A2F36400663CC9 /* adiumPurpleCore.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2209EBCE6500232CC4 /* adiumPurpleEventloop.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE18A07A2F2A600663CC9 /* adiumPurpleEventloop.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2309EBCE6500232CC4 /* adiumPurpleEventloop.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE18B07A2F2A600663CC9 /* adiumPurpleEventloop.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2309EBCE6500232CC4 /* adiumPurpleEventloop.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE18B07A2F2A600663CC9 /* adiumPurpleEventloop.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2409EBCE6500232CC4 /* adiumPurpleFt.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE11007A2EED500663CC9 /* adiumPurpleFt.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2509EBCE6500232CC4 /* adiumPurpleFt.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11107A2EED600663CC9 /* adiumPurpleFt.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2509EBCE6500232CC4 /* adiumPurpleFt.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11107A2EED600663CC9 /* adiumPurpleFt.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2609EBCE6500232CC4 /* adiumPurpleNotify.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE12207A2EFF800663CC9 /* adiumPurpleNotify.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2709EBCE6500232CC4 /* adiumPurpleNotify.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE12307A2EFF800663CC9 /* adiumPurpleNotify.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2709EBCE6500232CC4 /* adiumPurpleNotify.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE12307A2EFF800663CC9 /* adiumPurpleNotify.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2809EBCE6500232CC4 /* adiumPurplePrivacy.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE11607A2EF2B00663CC9 /* adiumPurplePrivacy.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2909EBCE6500232CC4 /* adiumPurplePrivacy.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11707A2EF2B00663CC9 /* adiumPurplePrivacy.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2909EBCE6500232CC4 /* adiumPurplePrivacy.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11707A2EF2B00663CC9 /* adiumPurplePrivacy.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2A09EBCE6500232CC4 /* adiumPurpleRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE11C07A2EF7F00663CC9 /* adiumPurpleRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2B09EBCE6500232CC4 /* adiumPurpleRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11D07A2EF7F00663CC9 /* adiumPurpleRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2B09EBCE6500232CC4 /* adiumPurpleRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE11D07A2EF7F00663CC9 /* adiumPurpleRequest.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2C09EBCE6500232CC4 /* adiumPurpleRoomlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE12807A2F09A00663CC9 /* adiumPurpleRoomlist.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2D09EBCE6500232CC4 /* adiumPurpleRoomlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE12907A2F09B00663CC9 /* adiumPurpleRoomlist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2D09EBCE6500232CC4 /* adiumPurpleRoomlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE12907A2F09B00663CC9 /* adiumPurpleRoomlist.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB2E09EBCE6500232CC4 /* adiumPurpleSignals.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE1B807A2F4C500663CC9 /* adiumPurpleSignals.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB2F09EBCE6500232CC4 /* adiumPurpleSignals.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE1B907A2F4C500663CC9 /* adiumPurpleSignals.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB2F09EBCE6500232CC4 /* adiumPurpleSignals.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE1B907A2F4C500663CC9 /* adiumPurpleSignals.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB3009EBCE6500232CC4 /* adiumPurpleWebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BBE18407A2F20E00663CC9 /* adiumPurpleWebcam.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB3109EBCE6500232CC4 /* adiumPurpleWebcam.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE18507A2F20E00663CC9 /* adiumPurpleWebcam.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB3109EBCE6500232CC4 /* adiumPurpleWebcam.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BBE18507A2F20E00663CC9 /* adiumPurpleWebcam.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB3709EBCE7400232CC4 /* PurpleService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415A63059F9B9B0019246B /* PurpleService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB3809EBCE7400232CC4 /* PurpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415A64059F9B9B0019246B /* PurpleService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB3809EBCE7400232CC4 /* PurpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415A64059F9B9B0019246B /* PurpleService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB3909EBCE7400232CC4 /* CBPurpleAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B7F278705440C8D00CDFC90 /* CBPurpleAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB3A09EBCE7400232CC4 /* CBPurpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348FF83E09128BEB00A942A8 /* CBPurpleAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB3A09EBCE7400232CC4 /* CBPurpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348FF83E09128BEB00A942A8 /* CBPurpleAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB5909EBCE7400232CC4 /* ESGaduGaduService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416159059FC5330019246B /* ESGaduGaduService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB5A09EBCE7400232CC4 /* ESGaduGaduService.m in Sources */ = {isa = PBXBuildFile; fileRef = 3441615A059FC5340019246B /* ESGaduGaduService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB5A09EBCE7400232CC4 /* ESGaduGaduService.m in Sources */ = {isa = PBXBuildFile; fileRef = 3441615A059FC5340019246B /* ESGaduGaduService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB5B09EBCE7400232CC4 /* ESPurpleGaduGaduAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34416070059FC27D0019246B /* ESPurpleGaduGaduAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB5C09EBCE7400232CC4 /* ESPurpleGaduGaduAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416071059FC27D0019246B /* ESPurpleGaduGaduAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB5C09EBCE7400232CC4 /* ESPurpleGaduGaduAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34416071059FC27D0019246B /* ESPurpleGaduGaduAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB5D09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D961C06B73B38005235E9 /* DCPurpleGaduGaduJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DB5E09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961D06B73B38005235E9 /* DCPurpleGaduGaduJoinChatViewController.m */; };
3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E4D961B06B73B38005235E9 /* DCPurpleGaduGaduJoinChatView.nib */; };
@@ -460,16 +460,16 @@
3485DB6D09EBCE7400232CC4 /* ESPurpleJabberAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42208086D9200E27095 /* ESPurpleJabberAccountView.nib */; };
3485DB6E09EBCE7400232CC4 /* PurpleDefaultsJabber.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BB19298079EE90900DAA523 /* PurpleDefaultsJabber.plist */; };
3485DB6F09EBCE7400232CC4 /* AIPurpleGTalkAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB7009EBCE7400232CC4 /* AIPurpleGTalkAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB7009EBCE7400232CC4 /* AIPurpleGTalkAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB7109EBCE7400232CC4 /* AIPurpleGTalkAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431D08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DB7209EBCE7400232CC4 /* AIPurpleGTalkAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0431E08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.m */; };
3485DB7309EBCE7400232CC4 /* AIGTalkService.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431F08D74D3100B48CE1 /* AIGTalkService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB7409EBCE7400232CC4 /* AIGTalkService.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0432008D74D3100B48CE1 /* AIGTalkService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB7409EBCE7400232CC4 /* AIGTalkService.m in Sources */ = {isa = PBXBuildFile; fileRef = A3C0432008D74D3100B48CE1 /* AIGTalkService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB7509EBCE7400232CC4 /* PurpleDefaultsGTalk.plist in Resources */ = {isa = PBXBuildFile; fileRef = A3C042D108D7483100B48CE1 /* PurpleDefaultsGTalk.plist */; };
3485DB7609EBCE7400232CC4 /* ESMeanwhileService.h in Headers */ = {isa = PBXBuildFile; fileRef = 343A7F3806935DD700150CEC /* ESMeanwhileService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB7709EBCE7400232CC4 /* ESMeanwhileService.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F3706935DD700150CEC /* ESMeanwhileService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB7709EBCE7400232CC4 /* ESMeanwhileService.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F3706935DD700150CEC /* ESMeanwhileService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB7809EBCE7400232CC4 /* ESPurpleMeanwhileAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 343A7F2D06935DC500150CEC /* ESPurpleMeanwhileAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB7909EBCE7400232CC4 /* ESPurpleMeanwhileAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F2C06935DC500150CEC /* ESPurpleMeanwhileAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB7909EBCE7400232CC4 /* ESPurpleMeanwhileAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A7F2C06935DC500150CEC /* ESPurpleMeanwhileAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB7A09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D962806B73C18005235E9 /* DCPurpleMeanwhileJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DB7B09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D962906B73C18005235E9 /* DCPurpleMeanwhileJoinChatViewController.m */; };
3485DB7C09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41408086D9100E27095 /* DCPurpleMeanwhileJoinChatView.nib */; };
@@ -489,9 +489,9 @@
3485DB8A09EBCE7400232CC4 /* ESPurpleMSNAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40508086D9000E27095 /* ESPurpleMSNAccountView.nib */; };
3485DB8B09EBCE7400232CC4 /* PurpleDefaultsMSN.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7644DD07A05E7E0021CCD7 /* PurpleDefaultsMSN.plist */; };
3485DB8F09EBCE7400232CC4 /* ESNovellService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2EA180634DB5E0018E5D2 /* ESNovellService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB9009EBCE7400232CC4 /* ESNovellService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2EA190634DB5E0018E5D2 /* ESNovellService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB9009EBCE7400232CC4 /* ESNovellService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2EA190634DB5E0018E5D2 /* ESNovellService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB9109EBCE7400232CC4 /* ESPurpleNovellAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C2E66F0634CF5F0018E5D2 /* ESPurpleNovellAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB9209EBCE7400232CC4 /* ESPurpleNovellAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2E6700634CF5F0018E5D2 /* ESPurpleNovellAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB9209EBCE7400232CC4 /* ESPurpleNovellAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C2E6700634CF5F0018E5D2 /* ESPurpleNovellAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB9309EBCE7400232CC4 /* DCPurpleNovellJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EA3688306B73E7D009CA81A /* DCPurpleNovellJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DB9409EBCE7400232CC4 /* DCPurpleNovellJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA3688406B73E7D009CA81A /* DCPurpleNovellJoinChatViewController.m */; };
3485DB9509EBCE7400232CC4 /* DCPurpleNovellJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EA3688206B73E7D009CA81A /* DCPurpleNovellJoinChatView.nib */; };
@@ -500,17 +500,17 @@
3485DB9809EBCE7400232CC4 /* ESPurpleNovellAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FF08086D9000E27095 /* ESPurpleNovellAccountView.nib */; };
3485DB9909EBCE7400232CC4 /* PurpleDefaultsGroupWise.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76476007A07BC90021CCD7 /* PurpleDefaultsGroupWise.plist */; };
3485DB9A09EBCE7400232CC4 /* ESSimpleService.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B590954AD1400FF3113 /* ESSimpleService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB9B09EBCE7400232CC4 /* ESSimpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B5A0954AD1400FF3113 /* ESSimpleService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB9B09EBCE7400232CC4 /* ESSimpleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B5A0954AD1400FF3113 /* ESSimpleService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB9C09EBCE7400232CC4 /* ESPurpleSimpleAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B650954AD2800FF3113 /* ESPurpleSimpleAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DB9D09EBCE7400232CC4 /* ESPurpleSimpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B660954AD2800FF3113 /* ESPurpleSimpleAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DB9D09EBCE7400232CC4 /* ESPurpleSimpleAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B660954AD2800FF3113 /* ESPurpleSimpleAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DB9E09EBCE7400232CC4 /* ESPurpleSimpleAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 345A7B6B0954AD3A00FF3113 /* ESPurpleSimpleAccountViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DB9F09EBCE7400232CC4 /* ESPurpleSimpleAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345A7B6C0954AD3A00FF3113 /* ESPurpleSimpleAccountViewController.m */; };
3485DBA009EBCE7400232CC4 /* ESPurpleSimpleAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B830954AEF400FF3113 /* ESPurpleSimpleAccountView.nib */; };
3485DBA109EBCE7400232CC4 /* PurpleDefaultsSimple.plist in Resources */ = {isa = PBXBuildFile; fileRef = 345A7B710954AD4D00FF3113 /* PurpleDefaultsSimple.plist */; };
3485DBA209EBCE7400232CC4 /* ESYahooService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415B9B059FA8DF0019246B /* ESYahooService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DBA309EBCE7400232CC4 /* ESYahooService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415B9C059FA8DF0019246B /* ESYahooService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DBA309EBCE7400232CC4 /* ESYahooService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415B9C059FA8DF0019246B /* ESYahooService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DBA409EBCE7400232CC4 /* ESPurpleYahooAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34415BD1059FA9CE0019246B /* ESPurpleYahooAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DBA509EBCE7400232CC4 /* ESPurpleYahooAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415BCF059FA9CD0019246B /* ESPurpleYahooAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DBA509EBCE7400232CC4 /* ESPurpleYahooAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34415BCF059FA9CD0019246B /* ESPurpleYahooAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DBA609EBCE7400232CC4 /* DCPurpleYahooJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EA3688F06B73F67009CA81A /* DCPurpleYahooJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DBA709EBCE7400232CC4 /* DCPurpleYahooJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EA3689006B73F67009CA81A /* DCPurpleYahooJoinChatViewController.m */; };
3485DBA809EBCE7400232CC4 /* DCPurpleYahooJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40E08086D9100E27095 /* DCPurpleYahooJoinChatView.nib */; };
@@ -519,14 +519,14 @@
3485DBAB09EBCE7400232CC4 /* ESPurpleYahooAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB42008086D9200E27095 /* ESPurpleYahooAccountView.nib */; };
3485DBAC09EBCE7400232CC4 /* PurpleDefaultsYahoo!.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76471707A079A40021CCD7 /* PurpleDefaultsYahoo!.plist */; };
3485DBAD09EBCE7400232CC4 /* ESYahooJapanService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E3C8870638D40500AA3EF7 /* ESYahooJapanService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DBAE09EBCE7400232CC4 /* ESYahooJapanService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8880638D40500AA3EF7 /* ESYahooJapanService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DBAE09EBCE7400232CC4 /* ESYahooJapanService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8880638D40500AA3EF7 /* ESYahooJapanService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DBAF09EBCE7400232CC4 /* ESPurpleYahooJapanAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E3C8A50638D50F00AA3EF7 /* ESPurpleYahooJapanAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DBB009EBCE7400232CC4 /* ESPurpleYahooJapanAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8A60638D50F00AA3EF7 /* ESPurpleYahooJapanAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DBB009EBCE7400232CC4 /* ESPurpleYahooJapanAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E3C8A60638D50F00AA3EF7 /* ESPurpleYahooJapanAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DBB109EBCE7400232CC4 /* PurpleDefaultsYahoo! Japan.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76478507A07C440021CCD7 /* PurpleDefaultsYahoo! Japan.plist */; };
3485DBB209EBCE7400232CC4 /* ESZephyrService.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D1B06CC079F00449EBB /* ESZephyrService.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DBB309EBCE7400232CC4 /* ESZephyrService.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D1A06CC079F00449EBB /* ESZephyrService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DBB309EBCE7400232CC4 /* ESZephyrService.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D1A06CC079F00449EBB /* ESZephyrService.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DBB409EBCE7400232CC4 /* ESPurpleZephyrAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2806CC07BD00449EBB /* ESPurpleZephyrAccount.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 3485DBB509EBCE7400232CC4 /* ESPurpleZephyrAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2606CC07BD00449EBB /* ESPurpleZephyrAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 3485DBB509EBCE7400232CC4 /* ESPurpleZephyrAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2606CC07BD00449EBB /* ESPurpleZephyrAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
3485DBB609EBCE7400232CC4 /* DCPurpleZephyrJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 348D8D2706CC07BD00449EBB /* DCPurpleZephyrJoinChatViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DBB709EBCE7400232CC4 /* DCPurpleZephyrJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348D8D2506CC07BD00449EBB /* DCPurpleZephyrJoinChatViewController.m */; };
3485DBB809EBCE7400232CC4 /* DCPurpleZephyrJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40908086D9100E27095 /* DCPurpleZephyrJoinChatView.nib */; };
@@ -596,7 +596,7 @@
34A9707E0C96602300F46006 /* sidebarStatusAreaBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A9707D0C96602200F46006 /* sidebarStatusAreaBackground.png */; };
34AE249E09BCCFA900A35B51 /* AIWindowDraggingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AE249C09BCCFA900A35B51 /* AIWindowDraggingView.m */; settings = {COMPILER_FLAGS = ""; }; };
34B1268E0B924E28003B0451 /* adiumPurpleDnsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B1268C0B924E28003B0451 /* adiumPurpleDnsRequest.h */; };
- 34B1268F0B924E28003B0451 /* adiumPurpleDnsRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B1268D0B924E28003B0451 /* adiumPurpleDnsRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34B1268F0B924E28003B0451 /* adiumPurpleDnsRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B1268D0B924E28003B0451 /* adiumPurpleDnsRequest.m */; settings = {COMPILER_FLAGS = ""; }; };
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 = ""; }; };
@@ -635,13 +635,13 @@
34CF9DF5085B8B7900D87E37 /* ESiTunesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */; settings = {COMPILER_FLAGS = ""; }; };
34D073CA0B1E1A4400D63DF2 /* ESPurpleDotMacAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B387EB807199FE5004DE713 /* ESPurpleDotMacAccountViewController.m */; };
34D073CB0B1E1A4500D63DF2 /* ESPurpleDotMacAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B387EB707199FE5004DE713 /* ESPurpleDotMacAccountViewController.h */; };
- 34D073CC0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F101E307342B4D00890D3B /* ESPurpleDotMacAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D073CC0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F101E307342B4D00890D3B /* ESPurpleDotMacAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
34D073CD0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F101E407342B4D00890D3B /* ESPurpleDotMacAccount.h */; };
- 34D073CE0B1E1A4500D63DF2 /* ESPurpleAIMAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EB8E07CD349200A82198 /* ESPurpleAIMAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D073CE0B1E1A4500D63DF2 /* ESPurpleAIMAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E0EB8E07CD349200A82198 /* ESPurpleAIMAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
34D073CF0B1E1A4500D63DF2 /* ESPurpleAIMAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E0EB8D07CD349200A82198 /* ESPurpleAIMAccount.h */; };
- 34D073D00B1E1A4500D63DF2 /* ESDotMacService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A406E00AD200FF7FBC /* ESDotMacService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D073D00B1E1A4500D63DF2 /* ESDotMacService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A406E00AD200FF7FBC /* ESDotMacService.m */; settings = {COMPILER_FLAGS = ""; }; };
34D073D10B1E1A4500D63DF2 /* ESDotMacService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A306E00AD200FF7FBC /* ESDotMacService.h */; };
- 34D073D20B1E1A4500D63DF2 /* ESAIMService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A206E00AD200FF7FBC /* ESAIMService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D073D20B1E1A4500D63DF2 /* ESAIMService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A206E00AD200FF7FBC /* ESAIMService.m */; settings = {COMPILER_FLAGS = ""; }; };
34D073D30B1E1A4500D63DF2 /* ESAIMService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A106E00AD200FF7FBC /* ESAIMService.h */; };
34D073D60B1E1A5000D63DF2 /* PurpleDefaultsMac.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76472E07A07A340021CCD7 /* PurpleDefaultsMac.plist */; };
34D073D70B1E1A5000D63DF2 /* PurpleDefaultsAIM.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7635A507A0581D0021CCD7 /* PurpleDefaultsAIM.plist */; };
@@ -660,9 +660,9 @@
34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */; settings = {COMPILER_FLAGS = ""; }; };
34D8154613B663700022C8C4 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154413B663700022C8C4 /* JSONKit.h */; };
34D8154713B663700022C8C4 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154513B663700022C8C4 /* JSONKit.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc -DNS_BLOCK_ASSERTIONS"; }; };
- 34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; settings = {COMPILER_FLAGS = ""; }; };
34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154A13B663A80022C8C4 /* auth_fb.h */; };
- 34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; settings = {COMPILER_FLAGS = ""; }; };
34D8155013B663A80022C8C4 /* fbapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154C13B663A80022C8C4 /* fbapi.h */; };
34D832A007CBD61A006466F2 /* ContactListDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8329F07CBD61A006466F2 /* ContactListDefaults.plist */; };
34D832AE07CBD62C006466F2 /* AdiumEmoticonset.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A507CBD62B006466F2 /* AdiumEmoticonset.icns */; };
@@ -822,7 +822,7 @@
34DC8A8E0A7EEEF7003E1636 /* AISoundSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD548AE086086B5008DF3CB /* AISoundSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A8F0A7EEEF7003E1636 /* AISoundSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD548AF086086B5008DF3CB /* AISoundSet.m */; };
34DC8A900A7EEEF7003E1636 /* AIToolbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E6D38E0727354600A2643A /* AIToolbar.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 34DC8A910A7EEEF7003E1636 /* AIToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E6D38F0727354600A2643A /* AIToolbar.m */; };
+ 34DC8A910A7EEEF7003E1636 /* AIToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 34E6D38F0727354600A2643A /* AIToolbar.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
34DC8A920A7EEEF7003E1636 /* AIColorPickerSliders.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D369ED08E7544D00E15E40 /* AIColorPickerSliders.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A930A7EEEF7003E1636 /* AIColorPickerSliders.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D369EE08E7544D00E15E40 /* AIColorPickerSliders.m */; };
34DC8A940A7EEEF7003E1636 /* AIPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9CF854080F9784000C5249 /* AIPathUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -830,7 +830,7 @@
34DC8A960A7EEEF7003E1636 /* AISortController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B422C0905ACB248005E720B /* AISortController.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A970A7EEEF7003E1636 /* AISortController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B422C0A05ACB248005E720B /* AISortController.m */; };
34DC8A980A7EEEF7003E1636 /* ESObjectWithProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 34111A5D06BE1B370005AF5C /* ESObjectWithProperties.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 34DC8A990A7EEEF7003E1636 /* ESObjectWithProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */; };
+ 34DC8A990A7EEEF7003E1636 /* ESObjectWithProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
34DC8A9A0A7EEEF7003E1636 /* AIChat.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B82138E049CA6CC00A8010A /* AIChat.h */; settings = {ATTRIBUTES = (Public, ); }; };
34DC8A9B0A7EEEF7003E1636 /* AIChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82138F049CA6CC00A8010A /* AIChat.m */; };
34DC8A9C0A7EEEF7003E1636 /* AIListObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF5BA14042F3CB200A8010A /* AIListObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -935,18 +935,18 @@
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 = ""; }; };
34E036720A75AA4F00394F11 /* CBOscarService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B919C9062DEF15004F1223 /* CBOscarService.h */; };
- 34E036730A75AA4F00394F11 /* CBOscarService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B919CA062DEF15004F1223 /* CBOscarService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34E036730A75AA4F00394F11 /* CBOscarService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B919CA062DEF15004F1223 /* CBOscarService.m */; settings = {COMPILER_FLAGS = ""; }; };
34E036740A75AA4F00394F11 /* CBPurpleOscarAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EA125EE055B633000ECF349 /* CBPurpleOscarAccount.h */; };
- 34E036750A75AA4F00394F11 /* CBPurpleOscarAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA125E8055B630900ECF349 /* CBPurpleOscarAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34E036750A75AA4F00394F11 /* CBPurpleOscarAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA125E8055B630900ECF349 /* CBPurpleOscarAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
34E036760A75AA4F00394F11 /* DCPurpleOscarJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E4D961606B73A96005235E9 /* DCPurpleOscarJoinChatViewController.h */; };
34E036770A75AA4F00394F11 /* DCPurpleOscarJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E4D961706B73A96005235E9 /* DCPurpleOscarJoinChatViewController.m */; };
34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40C08086D9100E27095 /* DCPurpleOscarJoinChatView.nib */; };
34E036790A75AA4F00394F11 /* AIPurpleAIMAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B9194B062DEC29004F1223 /* AIPurpleAIMAccountViewController.h */; };
34E0367A0A75AA4F00394F11 /* AIPurpleAIMAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B9194A062DEC29004F1223 /* AIPurpleAIMAccountViewController.m */; };
34E036880A75AA4F00394F11 /* ESICQService.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAFD5A506E00AD200FF7FBC /* ESICQService.h */; };
- 34E036890A75AA4F00394F11 /* ESICQService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A606E00AD200FF7FBC /* ESICQService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34E036890A75AA4F00394F11 /* ESICQService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAFD5A606E00AD200FF7FBC /* ESICQService.m */; settings = {COMPILER_FLAGS = ""; }; };
34E0368A0A75AA4F00394F11 /* ESPurpleICQAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F52BD806E2B24100887BE2 /* ESPurpleICQAccount.h */; };
- 34E0368B0A75AA4F00394F11 /* ESPurpleICQAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD906E2B24200887BE2 /* ESPurpleICQAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 34E0368B0A75AA4F00394F11 /* ESPurpleICQAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD906E2B24200887BE2 /* ESPurpleICQAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
34E0368C0A75AA4F00394F11 /* ESPurpleICQAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F52BCF06E2AFF700887BE2 /* ESPurpleICQAccountViewController.h */; };
34E0368D0A75AA4F00394F11 /* ESPurpleICQAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F52BD006E2AFF700887BE2 /* ESPurpleICQAccountViewController.m */; };
34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41A08086D9100E27095 /* ESPurpleICQAccountView.nib */; };
@@ -1147,8 +1147,8 @@
632D859E0DB70FC800040EC7 /* AIMentionEventPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 632D859D0DB70FC800040EC7 /* AIMentionEventPlugin.m */; };
6332879B0A769BF3004D0F2B /* AIPurpleLiveJournalAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 63125D8D0A75EBF000303EE9 /* AIPurpleLiveJournalAccount.h */; };
6332879C0A769BF3004D0F2B /* AILiveJournalService.h in Headers */ = {isa = PBXBuildFile; fileRef = 63125D970A75ECE400303EE9 /* AILiveJournalService.h */; };
- 6332879D0A769C18004D0F2B /* AIPurpleLiveJournalAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 63125D8E0A75EBF000303EE9 /* AIPurpleLiveJournalAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- 6332879E0A769C18004D0F2B /* AILiveJournalService.m in Sources */ = {isa = PBXBuildFile; fileRef = 63125D980A75ECE400303EE9 /* AILiveJournalService.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 6332879D0A769C18004D0F2B /* AIPurpleLiveJournalAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 63125D8E0A75EBF000303EE9 /* AIPurpleLiveJournalAccount.m */; settings = {COMPILER_FLAGS = ""; }; };
+ 6332879E0A769C18004D0F2B /* AILiveJournalService.m in Sources */ = {isa = PBXBuildFile; fileRef = 63125D980A75ECE400303EE9 /* AILiveJournalService.m */; settings = {COMPILER_FLAGS = ""; }; };
633287C40A769ECB004D0F2B /* PurpleDefaultsLiveJournal.plist in Resources */ = {isa = PBXBuildFile; fileRef = 63125D990A75ECE400303EE9 /* PurpleDefaultsLiveJournal.plist */; };
6333699409497DB000970871 /* EmoticonPreviewView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6333699309497DB000970871 /* EmoticonPreviewView.nib */; };
63336B060949908300970871 /* DockIconPreviewView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 63336B050949908300970871 /* DockIconPreviewView.nib */; };
@@ -1405,7 +1405,7 @@
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 */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 811033510CDE170B00EC6038 /* ssl-cdsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 811033500CDE170B00EC6038 /* ssl-cdsa.c */; settings = {COMPILER_FLAGS = ""; }; };
811034050CDE216F00EC6038 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340C1ABE0BD58FAB00D09235 /* Security.framework */; };
811035180CDE783800EC6038 /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811035170CDE783800EC6038 /* SecurityInterface.framework */; };
811036180CDE8A2500EC6038 /* AIPurpleCertificateViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 811036160CDE8A2500EC6038 /* AIPurpleCertificateViewer.h */; };
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m Tue Apr 24 23:05:07 2012 -0400
@@ -119,8 +119,6 @@
[pictureTaker close];
pictureTaker = nil;
}
-
- delegate = nil;
}
#pragma mark Getters and Setters
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/AIUtilities Framework/Source/AIPreferenceCollectionView.h
--- a/Frameworks/AIUtilities Framework/Source/AIPreferenceCollectionView.h Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIPreferenceCollectionView.h Tue Apr 24 23:05:07 2012 -0400
@@ -24,11 +24,11 @@
*/
@interface AIPreferenceCollectionView : NSCollectionView {
NSUInteger highlightedIndex;
- id <AIPreferenceCollectionViewDelegate> delegate;
+ id <AIPreferenceCollectionViewDelegate> __weak delegate;
}
@property (assign, nonatomic) NSUInteger highlightedIndex;
- at property (nonatomic) id <AIPreferenceCollectionViewDelegate> delegate;
+ at property (weak, nonatomic) id <AIPreferenceCollectionViewDelegate> delegate;
@end
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAbstractAccount.h
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.h Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.h Tue Apr 24 23:05:07 2012 -0400
@@ -95,7 +95,7 @@
- (void)getProxyConfigurationNotifyingTarget:(id)target selector:(SEL)selector context:(id)context;
- (NSString *)lastDisconnectionError;
- (void)setLastDisconnectionError:(NSString *)inError;
-- (AIReconnectDelayType)shouldAttemptReconnectAfterDisconnectionError:(NSString **)disconnectionError;
+- (AIReconnectDelayType)shouldAttemptReconnectAfterDisconnectionError:(NSString * __strong *)disconnectionError;
@property (readonly, nonatomic) BOOL encrypted;
//FUS Disconnecting
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAbstractAccount.m
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m Tue Apr 24 23:05:07 2012 -0400
@@ -73,7 +73,7 @@
*/
- (id)initWithUID:(NSString *)inUID internalObjectID:(NSString *)inInternalObjectID service:(AIService *)inService
{
- internalObjectID = [inInternalObjectID retain];
+ internalObjectID = inInternalObjectID;
if ((self = [super initWithUID:inUID service:inService])) {
isTemporary = NO;
@@ -84,8 +84,8 @@
static NSDictionary *defaults = nil;
if (!defaults) {
- defaults = [[NSDictionary dictionaryNamed:ACCOUNT_DEFAULTS
- forClass:[AIAccount class]] retain];
+ defaults = [NSDictionary dictionaryNamed:ACCOUNT_DEFAULTS
+ forClass:[AIAccount class]];
}
[adium.preferenceController registerDefaults:defaults
@@ -285,8 +285,7 @@
//Set our UID first (since self.formattedUID uses the UID as necessary)
if (![newProposedUID isEqualToString:self.UID]) {
- [UID release];
- UID = [newProposedUID retain];
+ UID = newProposedUID;
//Inform the account controller of the changed UID
[adium.accountController accountDidChangeUID:self];
@@ -350,17 +349,17 @@
if (silenceAllContactUpdatesTimer) {
[silenceAllContactUpdatesTimer invalidate];
- [silenceAllContactUpdatesTimer release]; silenceAllContactUpdatesTimer = nil;
+ silenceAllContactUpdatesTimer = nil;
}
- silenceAllContactUpdatesTimer = [[NSTimer scheduledTimerWithTimeInterval:interval
+ silenceAllContactUpdatesTimer = [NSTimer scheduledTimerWithTimeInterval:interval
target:self
selector:@selector(_endSilenceAllUpdates)
userInfo:nil
- repeats:NO] retain];
+ repeats:NO];
}
- (void)_endSilenceAllUpdates
{
- [silenceAllContactUpdatesTimer release]; silenceAllContactUpdatesTimer = nil;
+ silenceAllContactUpdatesTimer = nil;
silentAndDelayed = NO;
}
@@ -379,11 +378,11 @@
[self delayedUpdateContactStatus:inContact];
//Guard against subsequent updates
- delayedUpdateStatusTimer = [[NSTimer scheduledTimerWithTimeInterval:[self delayedUpdateStatusInterval]
+ delayedUpdateStatusTimer = [NSTimer scheduledTimerWithTimeInterval:[self delayedUpdateStatusInterval]
target:self
selector:@selector(_delayedUpdateStatusTimer:)
userInfo:nil
- repeats:YES] retain];
+ repeats:YES];
} else {
//If there is an outstanding delay, set this contact as the target
if (!delayedUpdateStatusTargets) delayedUpdateStatusTargets = [[NSMutableArray alloc] init];
@@ -400,10 +399,10 @@
/* If we're done, release the array and stop the repeating timer */
if (![delayedUpdateStatusTargets count]) {
- [delayedUpdateStatusTargets release]; delayedUpdateStatusTargets = nil;
+ delayedUpdateStatusTargets = nil;
[delayedUpdateStatusTimer invalidate];
- [delayedUpdateStatusTimer release]; delayedUpdateStatusTimer = nil;
+ delayedUpdateStatusTimer = nil;
}
}
@@ -535,7 +534,7 @@
} else if ([key isEqualToString:KEY_USER_ICON]) {
NSData *originalData = [self userIconData];
- [self setAccountUserImage:(originalData ? [[[NSImage alloc] initWithData:originalData] autorelease] : nil)
+ [self setAccountUserImage:(originalData ? [[NSImage alloc] initWithData:originalData] : nil)
withData:originalData];
}
}
@@ -729,7 +728,7 @@
- (void)setPasswordTemporarily:(NSString *)inPassword
{
if (password != inPassword) {
- [password release]; password = [inPassword retain];
+ password = inPassword;
}
}
@@ -984,11 +983,11 @@
- (void)_startAttributedRefreshTimer
{
if (!attributedRefreshTimer) {
- attributedRefreshTimer = [[NSTimer scheduledTimerWithTimeInterval:FILTERED_STRING_REFRESH
+ attributedRefreshTimer = [NSTimer scheduledTimerWithTimeInterval:FILTERED_STRING_REFRESH
target:self
selector:@selector(_refreshAttributedStrings:)
userInfo:nil
- repeats:YES] retain];
+ repeats:YES];
}
}
@@ -999,7 +998,6 @@
{
if (attributedRefreshTimer) {
[attributedRefreshTimer invalidate];
- [attributedRefreshTimer release];
attributedRefreshTimer = nil;
}
}
@@ -1025,7 +1023,7 @@
if ([dynamicKeys count]) {
NSString *key;
- for (key in [[dynamicKeys copy] autorelease]) {
+ for (key in [dynamicKeys copy]) {
[self updateStatusForKey:key];
}
@@ -1177,7 +1175,7 @@
withSource:nil
destination:chat.account
date:[NSDate date]
- message:[[[NSAttributedString alloc] initWithString:AILocalizedStringFromTableInBundle(@"You have connected", nil, [NSBundle bundleForClass:[AIAccount class]], "Displayed in an open chat when its account has been connected")] autorelease]
+ message:[[NSAttributedString alloc] initWithString:AILocalizedStringFromTableInBundle(@"You have connected", nil, [NSBundle bundleForClass:[AIAccount class]], "Displayed in an open chat when its account has been connected")]
withType:@"connected"];
[eventMessage setCoalescingKey:ACCOUNT_STATUS_UPDATE_COALESCING_KEY];
@@ -1348,7 +1346,7 @@
withSource:chat.account
destination:chat.account
date:[NSDate date]
- message:[[[NSAttributedString alloc] initWithString:AILocalizedStringFromTableInBundle(@"You have disconnected", nil, [NSBundle bundleForClass:[AIAccount class]], "Displayed in an open chat when its account has been connected")] autorelease]
+ message:[[NSAttributedString alloc] initWithString:AILocalizedStringFromTableInBundle(@"You have disconnected", nil, [NSBundle bundleForClass:[AIAccount class]], "Displayed in an open chat when its account has been connected")]
withType:@"disconnected"];
[newStatusMessage setCoalescingKey:ACCOUNT_STATUS_UPDATE_COALESCING_KEY];
@@ -1459,8 +1457,7 @@
}
if (lastDisconnectionError != inError) {
- [lastDisconnectionError release];
- lastDisconnectionError = [inError retain];
+ lastDisconnectionError = inError;
}
}
@@ -1470,7 +1467,7 @@
* Subclasses should return AIReconnectImmediately for invalid passwords or situations where immediate reconnect is possible,
* AIReconnectNormally to use the builtin exponential reconnect delay, and AIReconnectNever on unrecoverable errors.
*/
-- (AIReconnectDelayType)shouldAttemptReconnectAfterDisconnectionError:(NSString **)disconnectionError
+- (AIReconnectDelayType)shouldAttemptReconnectAfterDisconnectionError:(NSString * __strong *)disconnectionError
{
return AIReconnectNormally;
}
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m Tue Apr 24 23:05:07 2012 -0400
@@ -82,8 +82,8 @@
{
if ((self = [super init]))
{
- contactListView = [inContactListView retain];
- scrollView_contactList = [inScrollView_contactList retain];
+ contactListView = inContactListView;
+ scrollView_contactList = inScrollView_contactList;
delegate = inDelegate;
hideRoot = YES;
@@ -140,24 +140,17 @@
*/
- (void)dealloc
{
- [contactList release];
[contactListView setDelegate:nil];
[contactListView setDataSource:nil];
- [contactListView release]; contactListView = nil;
- [scrollView_contactList release]; scrollView_contactList = nil;
+ scrollView_contactList = nil;
if (tooltipTracker) {
[tooltipTracker setDelegate:nil];
- [tooltipTracker release]; tooltipTracker = nil;
+ tooltipTracker = nil;
}
- [groupCell release];
- [contentCell release];
-
[[NSNotificationCenter defaultCenter] removeObserver:self];
-
- [super dealloc];
}
/*!
@@ -207,14 +200,14 @@
- (void)configureViewsAndTooltips
{
//Configure the contact list view
- tooltipTracker = [[AISmoothTooltipTracker smoothTooltipTrackerForView:scrollView_contactList
- withDelegate:self] retain];
+ tooltipTracker = [AISmoothTooltipTracker smoothTooltipTrackerForView:scrollView_contactList
+ withDelegate:self];
/* The table column will want to interact with a cell. We use an AIMultiCellOutlineView subclass, though,
* so the contentCell and groupCell set in updateLayoutFromPrefDict:andThemeFromPrefDict: will actually be
* the primary actors.
*/
- [[[contactListView tableColumns] objectAtIndex:0] setDataCell:[[[AIListCell alloc] init] autorelease]];
+ [[[contactListView tableColumns] objectAtIndex:0] setDataCell:[[AIListCell alloc] init]];
//Targeting
[contactListView setTarget:self];
@@ -245,7 +238,7 @@
- (void)setContactListRoot:(ESObjectWithProperties<AIContainingObject> *)newContactListRoot
{
if (contactList != newContactListRoot) {
- [contactList release]; contactList = [newContactListRoot retain];
+ contactList = newContactListRoot;
}
[contactListView reloadData];
@@ -328,10 +321,6 @@
NSTextAlignment contentCellAlignment, groupCellAlignment;
BOOL pillowsOrPillowsFittedWindowStyle;
- //Cells
- [groupCell release];
- [contentCell release];
-
contentCellAlignment = [[prefDict objectForKey:KEY_LIST_LAYOUT_ALIGNMENT] intValue];
groupCellAlignment = [[prefDict objectForKey:KEY_LIST_LAYOUT_GROUP_ALIGNMENT] intValue];
@@ -581,7 +570,7 @@
//Redraw the modified object (or the whole list, if object is nil)
if (object) {
- for (AIProxyListObject *proxyObject in [[object.proxyObjects copy] autorelease]) {
+ for (AIProxyListObject *proxyObject in [object.proxyObjects copy]) {
[contactListView redisplayItem:proxyObject];
}
} else {
@@ -592,7 +581,7 @@
* For example, when a contact changes, redraw the metacontact which represents it if appropriate.
*/
if (object && [object isKindOfClass:[AIListContact class]] && ([(AIListContact *)object parentContact] != object)) {
- for (AIProxyListObject *proxyObject in [[[(AIListContact *)object parentContact].proxyObjects copy] autorelease]) {
+ for (AIProxyListObject *proxyObject in [[(AIListContact *)object parentContact].proxyObjects copy]) {
[contactListView redisplayItem:proxyObject];
}
}
@@ -776,8 +765,7 @@
{
NSArray *items = [notification object];
if (dragItems != items) {
- [dragItems release];
- dragItems = [items retain];
+ dragItems = items;
}
// Remove this contact list if from drag & drop operation took the last group away
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m Tue Apr 24 23:05:07 2012 -0400
@@ -53,8 +53,6 @@
[[NSNotificationCenter defaultCenter] removeObserver:self name:AIStatusIconSetDidChangeNotification object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:AIServiceIconSetDidChangeNotification object:nil];
[self _destroyMenuItems];
-
- [super dealloc];
}
/*!
@@ -63,7 +61,7 @@
- (NSArray *)menuItems
{
if(!menuItems){
- menuItems = [[self buildMenuItems] retain];
+ menuItems = [self buildMenuItems];
}
return menuItems;
@@ -99,11 +97,11 @@
{
for (NSMenuItem *menuItem in self.menuItems) {
if ([menuItem representedObject] == object) {
- return [[menuItem retain] autorelease];
+ return menuItem;
} else if ([menuItem submenu]) {
for (NSMenuItem *submenuItem in menuItem.submenu.itemArray) {
if ([submenuItem representedObject] == object)
- return [[submenuItem retain] autorelease];
+ return submenuItem;
}
}
}
@@ -124,8 +122,8 @@
*/
- (void)_destroyMenuItems
{
- [menu release]; menu = nil;
- [menuItems release]; menuItems = nil;
+ menu = nil;
+ menuItems = nil;
}
@@ -176,7 +174,7 @@
[secondaryIcon drawInRect:compositeRect atSize:[secondaryIcon size] position:IMAGE_POSITION_RIGHT fraction:1.0f];
[composite unlockFocus];
- return [composite autorelease];
+ return composite;
}
@end
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAccount.h
--- a/Frameworks/Adium Framework/Source/AIAccount.h Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccount.h Tue Apr 24 23:05:07 2012 -0400
@@ -203,10 +203,10 @@
- (void)didChangeUID;
- (void)willBeDeleted;
- (id<AIAccountControllerRemoveConfirmationDialog>)confirmationDialogForAccountDeletion __attribute__((objc_method_family(new)));
- at property (readonly, nonatomic) id<AIAccountControllerRemoveConfirmationDialog> confirmationDialogForAccountDeletion;
- at property (readonly, nonatomic) NSAlert *alertForAccountDeletion;
+ at property (unsafe_unretained, readonly, nonatomic) id<AIAccountControllerRemoveConfirmationDialog> confirmationDialogForAccountDeletion;
+ at property (weak, readonly, nonatomic) NSAlert *alertForAccountDeletion;
- (void)alertForAccountDeletion:(id<AIAccountControllerRemoveConfirmationDialog>)dialog didReturn:(NSInteger)returnCode;
- at property (readonly, nonatomic) NSString *explicitFormattedUID;
+ at property (weak, readonly, nonatomic) NSString *explicitFormattedUID;
@property (readonly, nonatomic) BOOL useHostForPasswordServerName;
@property (readonly, nonatomic) BOOL useInternalObjectIDForPasswordName;
@@ -224,7 +224,7 @@
@property (readwrite, nonatomic) BOOL isTemporary;
//Status
- at property (readonly, nonatomic) NSSet *supportedPropertyKeys;
+ at property (weak, readonly, nonatomic) NSSet *supportedPropertyKeys;
- (id)statusForKey:(NSString *)key;
- (void)updateStatusForKey:(NSString *)key;
- (void)delayedUpdateContactStatus:(AIListContact *)inContact;
@@ -272,12 +272,12 @@
- (NSArray *)menuItemsForChat:(AIChat *)inChat;
//Account-specific menu items
- at property (readonly, nonatomic) NSArray *accountActionMenuItems;
+ at property (weak, readonly, nonatomic) NSArray *accountActionMenuItems;
- (void)accountMenuDidUpdate:(NSMenuItem*)menuItem;
//Secure messaging
- (BOOL)allowSecureMessagingTogglingForChat:(AIChat *)inChat;
- at property (readonly, nonatomic) NSString *aboutEncryption;
+ at property (weak, readonly, nonatomic) NSString *aboutEncryption;
- (void)requestSecureMessaging:(BOOL)inSecureMessaging
inChat:(AIChat *)inChat;
- (void)promptToVerifyEncryptionIdentityInChat:(AIChat *)inChat;
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAccount.m
--- a/Frameworks/Adium Framework/Source/AIAccount.m Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccount.m Tue Apr 24 23:05:07 2012 -0400
@@ -49,7 +49,7 @@
- (id)initWithAccount:(AIAccount*)ac alert:(NSAlert*)al;
- at property (readwrite, retain, nonatomic) id userData;
+ at property (readwrite, nonatomic) id userData;
- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@@ -60,17 +60,11 @@
- (id)initWithAccount:(AIAccount*)ac alert:(NSAlert*)al {
if((self = [super init])) {
account = ac;
- alert = [al retain];
+ alert = al;
}
return self;
}
-- (void)dealloc {
- [alert release];
- [userData release];
- [super dealloc];
-}
-
@synthesize userData;
- (void)runModal {
@@ -123,28 +117,24 @@
- (void)dealloc
{
- [formattedUID release]; formattedUID = nil;
- [accountStatus release]; accountStatus = nil;
- [waitingToReconnect release]; waitingToReconnect = nil;
- [connectionProgressString release]; connectionProgressString = nil;
- [currentDisplayName release]; currentDisplayName = nil;
+ formattedUID = nil;
+ accountStatus = nil;
+ waitingToReconnect = nil;
+ connectionProgressString = nil;
+ currentDisplayName = nil;
- [lastDisconnectionError release];
- [delayedUpdateStatusTargets release];
- [delayedUpdateStatusTimer invalidate]; [delayedUpdateStatusTimer release];
+ [delayedUpdateStatusTimer invalidate];
/* Our superclass releases internalObjectID in its dealloc, so we should set it to nil when do.
* We could just depend upon its implementation, but this is more robust.
*/
- [internalObjectID release]; internalObjectID = nil;
+ internalObjectID = nil;
[self _stopAttributedRefreshTimer];
- [autoRefreshingKeys release]; autoRefreshingKeys = nil;
+ autoRefreshingKeys = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self];
[adium.preferenceController unregisterPreferenceObserver:self];
-
- [super dealloc];
}
/*!
@@ -303,8 +293,6 @@
if(returnCode == NSAlertDefaultReturn) {
[self performDelete];
}
-
- [(AIAccountDeletionDialog*)dialog release];
}
/*!
@@ -459,7 +447,7 @@
- (NSImage *)userIcon
{
NSData *iconData = [self userIconData];
- return (iconData ? [[[NSImage alloc] initWithData:iconData] autorelease] : nil);
+ return (iconData ? [[NSImage alloc] initWithData:iconData] : nil);
}
@synthesize isTemporary;
@@ -1061,10 +1049,10 @@
AIService *theService = self.service;
NSScriptObjectSpecifier *containerRef = [theService objectSpecifier];
- return [[[NSUniqueIDSpecifier alloc]
+ return [[NSUniqueIDSpecifier alloc]
initWithContainerClassDescription:[containerRef keyClassDescription]
containerSpecifier:containerRef key:@"accounts"
- uniqueID:[self scriptingInternalObjectID]] autorelease];
+ uniqueID:[self scriptingInternalObjectID]];
}
/**
@@ -1206,7 +1194,7 @@
return nil;
}
//this can take a while...
- NSMutableArray *newParticipants = [[[NSMutableArray alloc] init] autorelease];
+ NSMutableArray *newParticipants = [[NSMutableArray alloc] init];
for (int i=0;i<[participants count];i++) {
[newParticipants addObject:[[participants objectAtIndex:i] objectsByEvaluatingSpecifier]];
}
@@ -1269,7 +1257,7 @@
}
} else {
if ([currentStatus mutabilityType] != AITemporaryEditableStatusState) {
- currentStatus = [[currentStatus mutableCopy] autorelease];
+ currentStatus = [currentStatus mutableCopy];
[currentStatus setMutabilityType:AITemporaryEditableStatusState];
}
[currentStatus setStatusType:type];
@@ -1290,7 +1278,7 @@
AIStatus *currentStatus = self.statusState;
if ([currentStatus mutabilityType] != AITemporaryEditableStatusState) {
- currentStatus = [[currentStatus mutableCopy] autorelease];
+ currentStatus = [currentStatus mutableCopy];
[currentStatus setMutabilityType:AITemporaryEditableStatusState];
}
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAccountMenu.h
--- a/Frameworks/Adium Framework/Source/AIAccountMenu.h Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountMenu.h Tue Apr 24 23:05:07 2012 -0400
@@ -54,7 +54,7 @@
*/
@property (readwrite, nonatomic) BOOL useSystemFont;
- at property (readwrite, nonatomic, assign) id<AIAccountMenuDelegate> delegate;
+ at property (readwrite, nonatomic, unsafe_unretained) id<AIAccountMenuDelegate> delegate;
- (NSMenuItem *)menuItemForAccount:(AIAccount *)account;
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAccountMenu.m
--- a/Frameworks/Adium Framework/Source/AIAccountMenu.m Mon Apr 23 10:39:43 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountMenu.m Tue Apr 24 23:05:07 2012 -0400
@@ -70,9 +70,9 @@
submenuType:(AIAccountSubmenuType)inSubmenuType
showTitleVerbs:(BOOL)inShowTitleVerbs
{
- return [[[self alloc] initWithDelegate:inDelegate
+ return [[self alloc] initWithDelegate:inDelegate
submenuType:inSubmenuType
- showTitleVerbs:inShowTitleVerbs] autorelease];
+ showTitleVerbs:inShowTitleVerbs];
}
/*!
@@ -110,7 +110,7 @@
[[AIContactObserverManager sharedManager] registerListObjectObserver:self];
if (submenuType == AIAccountStatusSubmenu) {
- statusMenu = [[AIStatusMenu statusMenuWithDelegate:self] retain];
+ statusMenu = [AIStatusMenu statusMenuWithDelegate:self];
}
//Rebuild our menu now
@@ -124,15 +124,13 @@
{
if (submenuType == AIAccountStatusSubmenu) {
[NSObject cancelPreviousPerformRequestsWithTarget:statusMenu];
- [statusMenu release]; statusMenu = nil;
+ statusMenu = nil;
}
[[AIContactObserverManager sharedManager] unregisterListObjectObserver:self];
[[NSNotificationCenter defaultCenter] removeObserver:self];
delegate = nil;
-
- [super dealloc];
}
/*!
@@ -242,7 +240,6 @@
[menuItem setSubmenu:[self actionsMenuForAccount:account]];
}
[menuItemArray addObject:menuItem];
- [menuItem release];
}
}
@@ -259,7 +256,6 @@
representedObject:account];
[self _updateMenuItem:menuItem];
[disabledAccountMenu addItem:menuItem];
- [menuItem release];
}
}
@@ -282,7 +278,6 @@
representedObject:nil];
[menuItemArray addObject:menuItem];
[menuItem setSubmenu:serviceMenu];
- [menuItem release];
}
if ([disabledAccountMenu numberOfItems]) {
@@ -293,10 +288,8 @@
representedObject:nil];
[menuItemArray addObject:menuItem];
[menuItem setSubmenu:disabledAccountMenu];
- [menuItem release];
}
- [disabledAccountMenu release];
}
if (submenuType == AIAccountStatusSubmenu) {
@@ -370,19 +363,13 @@
[SSLIconText addAttribute:NSBaselineOffsetAttributeName value:[NSNumber numberWithFloat:-3.0f] range:NSMakeRange(0, [SSLIconText length])];
[title appendAttributedString:SSLIconText];
- [SSLIconText release];
[menuItem setAttributedTitle:title];
- [title release];
- [textAttachment release];
- [fileWrapper release];
} else {
[menuItem setAttributedTitle:plainTitle];
}
- [plainTitle release];
-
[account accountMenuDidUpdate:menuItem];
[[menuItem menu] setMenuChangedMessagesEnabled:YES];
@@ -518,7 +505,7 @@
*/
- (NSMenu *)actionsMenuForAccount:(AIAccount *)inAccount
{
- NSMenu *actionsSubmenu = [[[NSMenu alloc] init] autorelease];
+ NSMenu *actionsSubmenu = [[NSMenu alloc] init];
[actionsSubmenu setDelegate:self];
@@ -567,7 +554,6 @@
keyEquivalent:@""
representedObject:inAccount];
[actionsSubmenu addItem:menuItem];
- [menuItem release];
[actionsSubmenu addItem:[NSMenuItem separatorItem]];
@@ -577,7 +563,6 @@
for (menuItem in accountActionMenuItems) {
NSMenuItem *newMenuItem = [menuItem copy];
[actionsSubmenu addItem:newMenuItem];
- [newMenuItem release];
}
//Separate the actions from our final menu items which apply to all accounts
@@ -598,7 +583,6 @@
representedObject:inAccount];
}
[actionsSubmenu addItem:menuItem];
- [menuItem release];
}
/*!
@@ -650,7 +634,6 @@
}
[submenuItem setRepresentedObject:newRepresentedObject];
- [newRepresentedObject release];
//Recurse into any submenu on this menu item
updateRepresentedObjectForSubmenusOfMenuItem(submenuItem, account);
@@ -678,7 +661,6 @@
[accountSubmenu insertItem:onlineOfflineItem atIndex:0];
[accountSubmenu insertItem:[NSMenuItem separatorItem] atIndex:1];
- [onlineOfflineItem release];
return accountSubmenu;
}
@@ -694,7 +676,7 @@
[accountSubmenu setMenuChangedMessagesEnabled:NO];
} else {
- accountSubmenu = [[[NSMenu alloc] init] autorelease];
+ accountSubmenu = [[NSMenu alloc] init];
[accountSubmenu setMenuChangedMessagesEnabled:NO];
//Enumerate all the menu items we were originally passed
@@ -728,11 +710,9 @@
NSMenuItem *newItem = [statusMenuItem copy];
actualMenuItem = newItem;
[accountSubmenu addItem:newItem];
- [newItem release];
}
[actualMenuItem setRepresentedObject:newRepresentedObject];
- [newRepresentedObject release];
updateRepresentedObjectForSubmenusOfMenuItem(actualMenuItem, account);
}
@@ -756,7 +736,6 @@
[accountSubmenu addItem:[NSMenuItem separatorItem]];
[accountSubmenu addItem:enableDisableItem];
- [enableDisableItem release];
[accountSubmenu setMenuChangedMessagesEnabled:YES];
diff -r 0ae4370b9d77 -r 34872b5f5a2c Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m
More information about the commits
mailing list