adium 5045:6958e72cf596: merge ARC into default
commits at adium.im
commits at adium.im
Tue Sep 11 21:45:13 UTC 2012
details: http://hg.adium.im/adium/rev/6958e72cf596
revision: 5045:6958e72cf596
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Sep 09 12:24:39 2012 -0400
merge ARC into default
Subject: adium 5046:dd84299f466b: Close ARC
details: http://hg.adium.im/adium/rev/dd84299f466b
revision: 5046:dd84299f466b
branch: ARC
author: Frank Dowsett <wixardy at adium.im>
date: Sun Sep 09 12:26:12 2012 -0400
Close ARC
diffs (truncated from 101510 to 1000 lines):
diff -r f3b7be2284a3 -r dd84299f466b .hgtags
--- a/.hgtags Thu Sep 06 21:09:42 2012 +0200
+++ b/.hgtags Sun Sep 09 12:26:12 2012 -0400
@@ -1,3 +1,1 @@
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
-64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
-8d4ed0d28f89a09c3deb3b4b1952e21cd4a5e563 1.5.2
diff -r f3b7be2284a3 -r dd84299f466b Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Sep 06 21:09:42 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Sun Sep 09 12:26:12 2012 -0400
@@ -140,11 +140,20 @@
1172FBCF0CDAA8D400B8E233 /* libintl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC70CDAA8D400B8E233 /* libintl.framework */; };
1172FBD00CDAA8D400B8E233 /* libmeanwhile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */; };
1172FBD10CDAA8D400B8E233 /* libpurple.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
+ 117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */; };
+ 117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D90EC759B9003E9B97 /* FTProgressResend.tif */; };
+ 117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */; };
+ 117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */; };
+ 117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */; };
+ 117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */; };
117D6DC00BC5F0C40080D02B /* msg-request-attention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* msg-request-attention.tiff */; };
11819A1B10D0B95D003E8ECA /* AIMediaControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 11819A0910D0B90E003E8ECA /* AIMediaControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
11879C0B0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */; };
11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
+ 118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
+ 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 */; };
1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */; };
@@ -297,6 +306,7 @@
344838B50BC860770083723B /* AIAccountListPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8C3C980825EAF9004B9F45 /* AIAccountListPreferences.m */; };
344839380BC862780083723B /* pref-messages.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336707CBD807006466F2 /* pref-messages.tiff */; };
3448399A0BC8644C0083723B /* AIAdvancedPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 344839980BC8644C0083723B /* AIAdvancedPreferencesPlugin.m */; };
+ 34483A990BC869680083723B /* AdvancedPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34483A980BC869680083723B /* AdvancedPreferences.xib */; };
3448758E06D1EBDF00DA778C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
3448761406D1EC0C00DA778C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3448758D06D1EBDF00DA778C /* Cocoa.framework */; };
344D974F0C3C442600498CA1 /* InstantMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97410C3C442500498CA1 /* InstantMessage.m */; };
@@ -537,6 +547,9 @@
349195670C9662AA00595A04 /* AIListBookmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 349195650C9662AA00595A04 /* AIListBookmark.h */; settings = {ATTRIBUTES = (Public, ); }; };
3496A8C207CE6B880055BBAB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3496A8C107CE6B880055BBAB /* InfoPlist.strings */; };
349710DD096C4C7700699948 /* Buttons.strings in Resources */ = {isa = PBXBuildFile; fileRef = 349710DB096C4C7700699948 /* Buttons.strings */; };
+ 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 */; };
349C6E8E07C972B2005EB896 /* AIExtendedStatusPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 349C6E8C07C972B2005EB896 /* AIExtendedStatusPlugin.m */; };
349E2E8E07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349E2E8C07A8AF0C00EAB76A /* AIEmoticonPackPreviewController.m */; };
@@ -545,7 +558,7 @@
34A1A8E70DFB276E00AC78CF /* SocialNetworkingCustomStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1A8E60DFB276E00AC78CF /* SocialNetworkingCustomStatus.xib */; };
34A1A8ED0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34A1A8EB0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.h */; };
34A1A8EE0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1A8EC0DFB27A800AC78CF /* AICustomSocialNetworkingStatusWindowController.m */; };
- 34A1AB6C0DFC531000AC78CF /* AIXMLChatlogConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1AB6B0DFC531000AC78CF /* AIXMLChatlogConverter.m */; };
+ 34A1AB6C0DFC531000AC78CF /* AIXMLChatlogConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1AB6B0DFC531000AC78CF /* AIXMLChatlogConverter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEE80DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib */; };
34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A1AEED0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib */; };
34A1B2C30DFDBA1200AC78CF /* AIStringDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A1B2C20DFDBA1200AC78CF /* AIStringDebug.m */; };
@@ -627,8 +640,6 @@
34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */; };
34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */; };
34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
- 34D7F1EA15F85DD300F32F9B /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
- 34D7F1EB15F85DD300F32F9B /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
@@ -639,7 +650,7 @@
34D8154213B663650022C8C4 /* AIFacebookXMPPService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */; };
34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */; };
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 = "-DNS_BLOCK_ASSERTIONS"; }; };
+ 34D8154713B663700022C8C4 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154513B663700022C8C4 /* JSONKit.m */; settings = {COMPILER_FLAGS = "-DNS_BLOCK_ASSERTIONS -fno-objc-arc"; }; };
34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; };
34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154A13B663A80022C8C4 /* auth_fb.h */; };
34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; };
@@ -705,6 +716,18 @@
34DC885F0A7EEE2E003E1636 /* ESFileTransferProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE2FE074D01D300E36B3B /* ESFileTransferProgressView.m */; };
34DC88620A7EEE2F003E1636 /* ESFileTransferProgressWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349FE2FC074D01D200E36B3B /* ESFileTransferProgressWindowController.m */; };
34DC88640A7EEE2F003E1636 /* ESFileTransferPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D2E8680758BB0B0054C56D /* ESFileTransferPreferences.m */; };
+ 34DC88650A7EEE2F003E1636 /* FTProgressRevealRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */; };
+ 34DC88660A7EEE2F003E1636 /* FTProgressRevealRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */; };
+ 34DC88670A7EEE2F003E1636 /* FTProgressStopRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324A07CBD53A006466F2 /* FTProgressStopRollover_Selected.tif */; };
+ 34DC88680A7EEE2F003E1636 /* FTProgressStop_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324B07CBD53A006466F2 /* FTProgressStop_Selected.tif */; };
+ 34DC88690A7EEE2F003E1636 /* FTProgressStop.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324C07CBD53A006466F2 /* FTProgressStop.tif */; };
+ 34DC886A0A7EEE2F003E1636 /* FTProgressStopRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324D07CBD53B006466F2 /* FTProgressStopRollover.tif */; };
+ 34DC886B0A7EEE2F003E1636 /* FTProgressRevealPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324E07CBD53B006466F2 /* FTProgressRevealPressed.tif */; };
+ 34DC886C0A7EEE2F003E1636 /* FTProgressReveal_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8324F07CBD53B006466F2 /* FTProgressReveal_Selected.tif */; };
+ 34DC886D0A7EEE2F003E1636 /* FTProgressReveal.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325007CBD53B006466F2 /* FTProgressReveal.tif */; };
+ 34DC886E0A7EEE2F003E1636 /* FTProgressStopPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325107CBD53B006466F2 /* FTProgressStopPressed_Selected.tif */; };
+ 34DC886F0A7EEE2F003E1636 /* FTProgressStopPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325207CBD53B006466F2 /* FTProgressStopPressed.tif */; };
+ 34DC88700A7EEE2F003E1636 /* FTProgressRevealPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8325307CBD53B006466F2 /* FTProgressRevealPressed_Selected.tif */; };
34DC88740A7EEE2F003E1636 /* AIPreferenceWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938BB033E739101A8010A /* AIPreferenceWindowController.m */; };
34DC88770A7EEE2F003E1636 /* AdiumSetupWizard.m in Sources */ = {isa = PBXBuildFile; fileRef = 344161BC0943E0D800BC26ED /* AdiumSetupWizard.m */; };
34DC88780A7EEE2F003E1636 /* AdiumyButler.png in Resources */ = {isa = PBXBuildFile; fileRef = 344161CF0943E20D00BC26ED /* AdiumyButler.png */; };
@@ -790,7 +813,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, ); }; };
@@ -798,7 +821,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, ); }; };
@@ -953,7 +976,9 @@
34F144430BA8FF3C000473DE /* EmoticonNames.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F144420BA8FF3B000473DE /* EmoticonNames.strings */; };
34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F17FCC0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h */; settings = {ATTRIBUTES = (Private, ); }; };
34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F17FCD0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m */; };
+ 34F312930ADC3FE800A4310E /* KNShelfSplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */; settings = {ATTRIBUTES = (Public, ); }; };
34F312BD0ADC43CA00A4310E /* xtras_duck.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F312BC0ADC43CA00A4310E /* xtras_duck.png */; };
+ 34F312F00ADC476300A4310E /* KNShelfSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */; };
34F4677A080F49C5007800AB /* Safari.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 34F46778080F49C5007800AB /* Safari.scpt */; };
34F4677B080F49C5007800AB /* Safari.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F46779080F49C5007800AB /* Safari.png */; };
34F46785080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46783080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m */; };
@@ -1050,8 +1075,6 @@
4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
- 5A1E24A915BC746B003A6F9E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 5A1E24AA15BC746B003A6F9E /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7914A272330063489D /* pref-messagehistory.png */; };
@@ -1228,7 +1251,7 @@
633400890F9C14C2003C77A9 /* AIDateAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFBE0F9C14C1003C77A9 /* AIDateAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
6334008A0F9C14C2003C77A9 /* AIDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFBF0F9C14C1003C77A9 /* AIDateAdditions.m */; };
6334008B0F9C14C2003C77A9 /* AIDateFormatterAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFC00F9C14C1003C77A9 /* AIDateFormatterAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 6334008C0F9C14C2003C77A9 /* AIDateFormatterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFC10F9C14C1003C77A9 /* AIDateFormatterAdditions.m */; };
+ 6334008C0F9C14C2003C77A9 /* AIDateFormatterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFC10F9C14C1003C77A9 /* AIDateFormatterAdditions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
6334008D0F9C14C2003C77A9 /* AIDictionaryAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFC20F9C14C1003C77A9 /* AIDictionaryAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
6334008E0F9C14C2003C77A9 /* AIDictionaryAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFC30F9C14C1003C77A9 /* AIDictionaryAdditions.m */; };
6334008F0F9C14C2003C77A9 /* AIEventAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFC40F9C14C1003C77A9 /* AIEventAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1247,8 +1270,6 @@
6334009C0F9C14C2003C77A9 /* AIMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD10F9C14C1003C77A9 /* AIMenuAdditions.m */; };
6334009D0F9C14C2003C77A9 /* AIMutableStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD20F9C14C1003C77A9 /* AIMutableStringAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
6334009E0F9C14C2003C77A9 /* AIMutableStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD30F9C14C1003C77A9 /* AIMutableStringAdditions.m */; };
- 6334009F0F9C14C2003C77A9 /* AIObjectAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD40F9C14C1003C77A9 /* AIObjectAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 633400A00F9C14C2003C77A9 /* AIObjectAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD50F9C14C1003C77A9 /* AIObjectAdditions.m */; };
633400A10F9C14C2003C77A9 /* AIOutlineViewAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD60F9C14C1003C77A9 /* AIOutlineViewAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400A20F9C14C2003C77A9 /* AIOutlineViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFD70F9C14C1003C77A9 /* AIOutlineViewAdditions.m */; };
633400A30F9C14C2003C77A9 /* AIParagraphStyleAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFD80F9C14C1003C77A9 /* AIParagraphStyleAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1361,15 +1382,8 @@
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
- 76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
- 76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
- 76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
- 76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* get-info.tiff */; };
76889DEF12D3CA40007AEF00 /* Personal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.tiff */; };
- 76B73B2114BE287D00A58BAB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76B73B2014BE287D00A58BAB /* Foundation.framework */; };
- 76B73B3014BE29AB00A58BAB /* im.adium.AIApplescriptRunner.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */; };
- 76B73B3414BE3B9400A58BAB /* AIApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */; };
76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
7E6F8A94105611B700C6D80D /* libotr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
7E6F8ACD105613AD00C6D80D /* libotr.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
@@ -1444,53 +1458,6 @@
C4D29CC40C3C2E3C001545A2 /* BGICImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC00C3C2E3C001545A2 /* BGICImportController.m */; };
C4D29CC60C3C2E3C001545A2 /* BGICLogImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */; };
C4D29CC80C3C2E49001545A2 /* ICImport.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4D29CC70C3C2E49001545A2 /* ICImport.xib */; };
- C61AFA9A15DD43C80001EDEF /* AboutDialog_bg at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */; };
- C699374B15F75FB2007EFFA0 /* stackImage at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C647215515F75E3700206892 /* stackImage at 2x.png */; };
- C6A42A8015C5B7290032FAB3 /* FTProgressReveal_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */; };
- C6A42A8115C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */; };
- C6A42A8215C5B7290032FAB3 /* FTProgressReveal.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7615C5B7290032FAB3 /* FTProgressReveal.png */; };
- C6A42A8315C5B7290032FAB3 /* FTProgressReveal at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7715C5B7290032FAB3 /* FTProgressReveal at 2x.png */; };
- C6A42A8415C5B7290032FAB3 /* FTProgressRevealPressed_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7815C5B7290032FAB3 /* FTProgressRevealPressed_Selected.png */; };
- C6A42A8515C5B7290032FAB3 /* FTProgressRevealPressed_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7915C5B7290032FAB3 /* FTProgressRevealPressed_Selected at 2x.png */; };
- C6A42A8615C5B7290032FAB3 /* FTProgressRevealPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7A15C5B7290032FAB3 /* FTProgressRevealPressed.png */; };
- C6A42A8715C5B7290032FAB3 /* FTProgressRevealPressed at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7B15C5B7290032FAB3 /* FTProgressRevealPressed at 2x.png */; };
- C6A42A8815C5B7290032FAB3 /* FTProgressRevealRollover_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7C15C5B7290032FAB3 /* FTProgressRevealRollover_Selected.png */; };
- C6A42A8915C5B7290032FAB3 /* FTProgressRevealRollover_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7D15C5B7290032FAB3 /* FTProgressRevealRollover_Selected at 2x.png */; };
- C6A42A8A15C5B7290032FAB3 /* FTProgressRevealRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7E15C5B7290032FAB3 /* FTProgressRevealRollover.png */; };
- C6A42A8B15C5B7290032FAB3 /* FTProgressRevealRollover at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7F15C5B7290032FAB3 /* FTProgressRevealRollover at 2x.png */; };
- C6A42A9815C5D6C30032FAB3 /* FTProgressResend_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A8C15C5D6C20032FAB3 /* FTProgressResend_Selected.png */; };
- C6A42A9915C5D6C30032FAB3 /* FTProgressResend_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A8D15C5D6C20032FAB3 /* FTProgressResend_Selected at 2x.png */; };
- C6A42A9A15C5D6C30032FAB3 /* FTProgressResend.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A8E15C5D6C20032FAB3 /* FTProgressResend.png */; };
- C6A42A9B15C5D6C30032FAB3 /* FTProgressResend at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A8F15C5D6C20032FAB3 /* FTProgressResend at 2x.png */; };
- C6A42A9C15C5D6C30032FAB3 /* FTProgressResendPressed_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9015C5D6C20032FAB3 /* FTProgressResendPressed_Selected.png */; };
- C6A42A9D15C5D6C30032FAB3 /* FTProgressResendPressed_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9115C5D6C20032FAB3 /* FTProgressResendPressed_Selected at 2x.png */; };
- C6A42A9E15C5D6C30032FAB3 /* FTProgressResendPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9215C5D6C30032FAB3 /* FTProgressResendPressed.png */; };
- C6A42A9F15C5D6C30032FAB3 /* FTProgressResendPressed at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9315C5D6C30032FAB3 /* FTProgressResendPressed at 2x.png */; };
- C6A42AA015C5D6C30032FAB3 /* FTProgressResendRollover_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9415C5D6C30032FAB3 /* FTProgressResendRollover_Selected.png */; };
- C6A42AA115C5D6C30032FAB3 /* FTProgressResendRollover_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9515C5D6C30032FAB3 /* FTProgressResendRollover_Selected at 2x.png */; };
- C6A42AA215C5D6C30032FAB3 /* FTProgressResendRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9615C5D6C30032FAB3 /* FTProgressResendRollover.png */; };
- C6A42AA315C5D6C30032FAB3 /* FTProgressResendRollover at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A9715C5D6C30032FAB3 /* FTProgressResendRollover at 2x.png */; };
- C6A42AB015C5DD790032FAB3 /* FTProgressStop_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AA415C5DD780032FAB3 /* FTProgressStop_Selected.png */; };
- C6A42AB115C5DD790032FAB3 /* FTProgressStop_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AA515C5DD780032FAB3 /* FTProgressStop_Selected at 2x.png */; };
- C6A42AB215C5DD790032FAB3 /* FTProgressStop.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AA615C5DD780032FAB3 /* FTProgressStop.png */; };
- C6A42AB315C5DD790032FAB3 /* FTProgressStop at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AA715C5DD780032FAB3 /* FTProgressStop at 2x.png */; };
- C6A42AB415C5DD790032FAB3 /* FTProgressStopPressed_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AA815C5DD780032FAB3 /* FTProgressStopPressed_Selected.png */; };
- C6A42AB515C5DD790032FAB3 /* FTProgressStopPressed_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AA915C5DD780032FAB3 /* FTProgressStopPressed_Selected at 2x.png */; };
- C6A42AB615C5DD790032FAB3 /* FTProgressStopPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAA15C5DD780032FAB3 /* FTProgressStopPressed.png */; };
- C6A42AB715C5DD790032FAB3 /* FTProgressStopPressed at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAB15C5DD780032FAB3 /* FTProgressStopPressed at 2x.png */; };
- C6A42AB815C5DD790032FAB3 /* FTProgressStopRollover_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAC15C5DD790032FAB3 /* FTProgressStopRollover_Selected.png */; };
- C6A42AB915C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAD15C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png */; };
- C6A42ABA15C5DD790032FAB3 /* FTProgressStopRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAE15C5DD790032FAB3 /* FTProgressStopRollover.png */; };
- C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */; };
- C6B545A815D338EE0005F1F8 /* SoundFileIcon at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */; };
- C6B545AA15D3390F0005F1F8 /* ABSearch at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */; };
- C6EE433E15C0A9BC00A4B96C /* default-icon at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */; };
- C6EE434015C0AA4600A4B96C /* emoticonBlank at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */; };
- C6EE434215C0AA6F00A4B96C /* sidebarActionWidget at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */; };
- C6EE434415C0AA8C00A4B96C /* SoundHigh at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434315C0AA8C00A4B96C /* SoundHigh at 2x.png */; };
- C6EE434615C0AA9100A4B96C /* SoundLow at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434515C0AA9100A4B96C /* SoundLow at 2x.png */; };
- C6EE434C15C0AB7400A4B96C /* Flap_192 at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434B15C0AB7400A4B96C /* Flap_192 at 2x.png */; };
- C6EE434E15C0AB7F00A4B96C /* Awake_192 at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434D15C0AB7F00A4B96C /* Awake_192 at 2x.png */; };
D10A3A2B122C61EF003B5A7E /* msg-source-destination.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */; };
EE147A6D0896B18800A21377 /* ABSearch.png in Resources */ = {isa = PBXBuildFile; fileRef = EE147A6C0896B18700A21377 /* ABSearch.png */; };
EE147A790896B32400A21377 /* ABSearch.xib in Resources */ = {isa = PBXBuildFile; fileRef = EE147A780896B32400A21377 /* ABSearch.xib */; };
@@ -1566,6 +1533,13 @@
remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
remoteInfo = AutoHyperlinks.framework;
};
+ 349C31620867D199000BF883 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 349C2EF90867AC97000BF883;
+ remoteInfo = AdiumApplescriptRunner;
+ };
6329EFB40F9D33A600112489 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -1615,13 +1589,6 @@
remoteGlobalIDString = F53C25AE0A2F95F100F7B73D;
remoteInfo = "Setup Build Directory";
};
- 76B73B3114BE2A5200A58BAB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 76B73B1D14BE287D00A58BAB;
- remoteInfo = AIApplescriptRunner;
- };
7E78DA9B0DD135DE00B9388F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */;
@@ -1654,6 +1621,7 @@
dstSubfolderSpec = 10;
files = (
116E369A10B72934002EDB0F /* Growl.framework in Copy Frameworks */,
+ 118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */,
633404710F9C18EF003C77A9 /* AIUtilities.framework in Copy Frameworks */,
639DF9D80F97E678003C9A32 /* AdiumLibpurple.framework in Copy Frameworks */,
11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */,
@@ -1666,8 +1634,6 @@
11EE1CD50CDD01120097F246 /* libpurple.framework in Copy Frameworks */,
EE5754ED0B3D7A7A00100989 /* Sparkle.framework in Copy Frameworks */,
377ED0220AE95D7D00CB7BDF /* PSMTabBarControl.framework in Copy Frameworks */,
- 76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */,
- 76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */,
9E1E1E270A96770C00E16DFC /* LMX.framework in Copy Frameworks */,
9719C92F1530EE4800217FBE /* FriBidi.framework in Copy Frameworks */,
9719C9301530EE4800217FBE /* ShortcutRecorder.framework in Copy Frameworks */,
@@ -1716,16 +1682,6 @@
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
- 76B73B2F14BE294900A58BAB /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = Contents/XPCServices;
- dstSubfolderSpec = 1;
- files = (
- 76B73B3014BE29AB00A58BAB /* im.adium.AIApplescriptRunner.xpc in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
F51BCD3E0A156281000FDC06 /* Copy Spotlight Importer */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -1875,6 +1831,12 @@
1172FBC70CDAA8D400B8E233 /* libintl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libintl.framework; path = Frameworks/libintl.framework; sourceTree = "<group>"; };
1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libmeanwhile.framework; path = Frameworks/libmeanwhile.framework; sourceTree = "<group>"; };
1172FBC90CDAA8D400B8E233 /* libpurple.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpurple.framework; path = Frameworks/libpurple.framework; sourceTree = "<group>"; };
+ 117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResend_Selected.tif; path = Resources/FTProgressResend_Selected.tif; sourceTree = "<group>"; };
+ 117866D90EC759B9003E9B97 /* FTProgressResend.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResend.tif; path = Resources/FTProgressResend.tif; sourceTree = "<group>"; };
+ 117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendPressed_Selected.tif; path = Resources/FTProgressResendPressed_Selected.tif; sourceTree = "<group>"; };
+ 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendPressed.tif; path = Resources/FTProgressResendPressed.tif; sourceTree = "<group>"; };
+ 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendRollover_Selected.tif; path = Resources/FTProgressResendRollover_Selected.tif; sourceTree = "<group>"; };
+ 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendRollover.tif; path = Resources/FTProgressResendRollover.tif; sourceTree = "<group>"; };
117D6DBF0BC5F0C40080D02B /* msg-request-attention.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-request-attention.tiff"; path = "Resources/msg-request-attention.tiff"; sourceTree = SOURCE_ROOT; };
1181981210D0B17C003E8ECA /* adiumPurpleMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adiumPurpleMedia.h; path = "Plugins/Purple Service/adiumPurpleMedia.h"; sourceTree = "<group>"; };
118199C410D0B65A003E8ECA /* AIMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMedia.h; path = "Frameworks/Adium Framework/Source/AIMedia.h"; sourceTree = "<group>"; };
@@ -2470,6 +2432,7 @@
344836910BC8510B0083723B /* SS_PreferencePaneProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SS_PreferencePaneProtocol.h; path = "Frameworks/Adium Framework/Source/SS_PreferencePaneProtocol.h"; sourceTree = "<group>"; };
344839970BC8644C0083723B /* AIAdvancedPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdvancedPreferencesPlugin.h; path = Source/AIAdvancedPreferencesPlugin.h; sourceTree = "<group>"; };
344839980BC8644C0083723B /* AIAdvancedPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdvancedPreferencesPlugin.m; path = Source/AIAdvancedPreferencesPlugin.m; sourceTree = "<group>"; };
+ 34483A980BC869680083723B /* AdvancedPreferences.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AdvancedPreferences.xib; path = Resources/AdvancedPreferences.xib; sourceTree = "<group>"; };
3448758D06D1EBDF00DA778C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
3449485508E9FCCD0054FF57 /* AIContactMenu.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactMenu.m; path = "Frameworks/Adium Framework/Source/AIContactMenu.m"; sourceTree = "<group>"; };
3449485608E9FCCD0054FF57 /* AIContactMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContactMenu.h; path = "Frameworks/Adium Framework/Source/AIContactMenu.h"; sourceTree = "<group>"; };
@@ -2902,6 +2865,7 @@
347E786A07CA972100350507 /* AddGroup.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AddGroup.xib; path = Resources/AddGroup.xib; sourceTree = "<group>"; };
347E787207CA975900350507 /* msg-add-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-add-contact.tiff"; path = "Resources/msg-add-contact.tiff"; sourceTree = "<group>"; };
347E787507CA975900350507 /* remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove.tiff; path = Resources/remove.tiff; sourceTree = "<group>"; };
+ 347E787607CA975900350507 /* importContacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = importContacts.png; path = Resources/importContacts.png; sourceTree = "<group>"; };
347E788707CA978D00350507 /* CBActionSupportPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBActionSupportPlugin.m; path = Source/CBActionSupportPlugin.m; sourceTree = "<group>"; };
347E788807CA978D00350507 /* CBActionSupportPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBActionSupportPlugin.h; path = Source/CBActionSupportPlugin.h; sourceTree = "<group>"; };
347E790D07CAA51400350507 /* AIManualSort.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIManualSort.m; path = Source/AIManualSort.m; sourceTree = "<group>"; };
@@ -2965,6 +2929,8 @@
3489506A0CDE0CC5002FEB4D /* IKRecentPicture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IKRecentPicture.h; path = Source/IKRecentPicture.h; sourceTree = "<group>"; };
348A8A190629A68C00FC6E03 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib"; sourceTree = "<group>"; };
348A901A062A13AB00FC6E03 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleYahooAccountView.xib"; sourceTree = "<group>"; };
+ 348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = KNShelfSplitView.m; path = Source/KNShelfSplitView.m; sourceTree = "<group>"; };
+ 348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KNShelfSplitView.h; path = Source/KNShelfSplitView.h; sourceTree = "<group>"; };
348C47150D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageWindowOutgoingScrollView.h; path = Source/AIMessageWindowOutgoingScrollView.h; sourceTree = "<group>"; };
348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageWindowOutgoingScrollView.m; path = Source/AIMessageWindowOutgoingScrollView.m; sourceTree = "<group>"; };
348D8D1A06CC079F00449EBB /* ESZephyrService.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESZephyrService.m; path = "Plugins/Purple Service/ESZephyrService.m"; sourceTree = "<group>"; };
@@ -3018,6 +2984,8 @@
3499F4A706309AF60035B468 /* ESPurpleRequestWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPurpleRequestWindowController.h; path = "Plugins/Purple Service/ESPurpleRequestWindowController.h"; sourceTree = "<group>"; };
349B39290A5FB150008BE092 /* AIContentEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContentEvent.h; path = "Frameworks/Adium Framework/Source/AIContentEvent.h"; sourceTree = "<group>"; };
349B392A0A5FB150008BE092 /* AIContentEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContentEvent.m; path = "Frameworks/Adium Framework/Source/AIContentEvent.m"; sourceTree = "<group>"; };
+ 349C2EFA0867AC97000BF883 /* AdiumApplescriptRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = AdiumApplescriptRunner; sourceTree = BUILT_PRODUCTS_DIR; };
+ 349C2F460867AD16000BF883 /* ApplescriptRunner.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ApplescriptRunner.m; path = Source/ApplescriptRunner.m; sourceTree = "<group>"; };
349C2FEF0867AD65000BF883 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
349C6E4607C96D44005EB896 /* CBContactCountingDisplayPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBContactCountingDisplayPlugin.m; path = Source/CBContactCountingDisplayPlugin.m; sourceTree = "<group>"; };
349C6E4707C96D45005EB896 /* CBContactCountingDisplayPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBContactCountingDisplayPlugin.h; path = Source/CBContactCountingDisplayPlugin.h; sourceTree = "<group>"; };
@@ -3409,8 +3377,6 @@
34D369ED08E7544D00E15E40 /* AIColorPickerSliders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIColorPickerSliders.h; path = "Frameworks/Adium Framework/Source/AIColorPickerSliders.h"; sourceTree = "<group>"; };
34D369EE08E7544D00E15E40 /* AIColorPickerSliders.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIColorPickerSliders.m; path = "Frameworks/Adium Framework/Source/AIColorPickerSliders.m"; sourceTree = "<group>"; };
34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DualWindowDefaults.plist; path = "Plugins/Dual Window Interface/DualWindowDefaults.plist"; sourceTree = "<group>"; };
- 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "ChatCyclingDefaults-Old.plist"; path = "Resources/ChatCyclingDefaults-Old.plist"; sourceTree = "<group>"; };
- 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ChatCyclingDefaults.plist; path = Resources/ChatCyclingDefaults.plist; sourceTree = "<group>"; };
34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccount.h; path = "Plugins/Purple Service/AIFacebookXMPPAccount.h"; sourceTree = "<group>"; };
34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPAccount.m; path = "Plugins/Purple Service/AIFacebookXMPPAccount.m"; sourceTree = "<group>"; };
34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccountViewController.h; path = "Plugins/Purple Service/AIFacebookXMPPAccountViewController.h"; sourceTree = "<group>"; };
@@ -3426,6 +3392,18 @@
34D8154A13B663A80022C8C4 /* auth_fb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auth_fb.h; sourceTree = "<group>"; };
34D8154B13B663A80022C8C4 /* fbapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fbapi.c; sourceTree = "<group>"; };
34D8154C13B663A80022C8C4 /* fbapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fbapi.h; sourceTree = "<group>"; };
+ 34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealRollover.tif; path = Resources/FTProgressRevealRollover.tif; sourceTree = "<group>"; };
+ 34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealRollover_Selected.tif; path = Resources/FTProgressRevealRollover_Selected.tif; sourceTree = "<group>"; };
+ 34D8324A07CBD53A006466F2 /* FTProgressStopRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStopRollover_Selected.tif; path = Resources/FTProgressStopRollover_Selected.tif; sourceTree = "<group>"; };
+ 34D8324B07CBD53A006466F2 /* FTProgressStop_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStop_Selected.tif; path = Resources/FTProgressStop_Selected.tif; sourceTree = "<group>"; };
+ 34D8324C07CBD53A006466F2 /* FTProgressStop.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStop.tif; path = Resources/FTProgressStop.tif; sourceTree = "<group>"; };
+ 34D8324D07CBD53B006466F2 /* FTProgressStopRollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStopRollover.tif; path = Resources/FTProgressStopRollover.tif; sourceTree = "<group>"; };
+ 34D8324E07CBD53B006466F2 /* FTProgressRevealPressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealPressed.tif; path = Resources/FTProgressRevealPressed.tif; sourceTree = "<group>"; };
+ 34D8324F07CBD53B006466F2 /* FTProgressReveal_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressReveal_Selected.tif; path = Resources/FTProgressReveal_Selected.tif; sourceTree = "<group>"; };
+ 34D8325007CBD53B006466F2 /* FTProgressReveal.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressReveal.tif; path = Resources/FTProgressReveal.tif; sourceTree = "<group>"; };
+ 34D8325107CBD53B006466F2 /* FTProgressStopPressed_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStopPressed_Selected.tif; path = Resources/FTProgressStopPressed_Selected.tif; sourceTree = "<group>"; };
+ 34D8325207CBD53B006466F2 /* FTProgressStopPressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStopPressed.tif; path = Resources/FTProgressStopPressed.tif; sourceTree = "<group>"; };
+ 34D8325307CBD53B006466F2 /* FTProgressRevealPressed_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealPressed_Selected.tif; path = Resources/FTProgressRevealPressed_Selected.tif; sourceTree = "<group>"; };
34D8326107CBD598006466F2 /* AccountPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = AccountPrefs.plist; path = Resources/AccountPrefs.plist; sourceTree = "<group>"; };
34D8326207CBD598006466F2 /* DockPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = DockPrefs.plist; path = Resources/DockPrefs.plist; sourceTree = "<group>"; };
34D8326307CBD598006466F2 /* msg-send-file.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-send-file.tiff"; path = "Resources/msg-send-file.tiff"; sourceTree = "<group>"; };
@@ -3890,8 +3868,6 @@
5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAutoScrollTextView.m; path = Source/AIAutoScrollTextView.m; sourceTree = "<group>"; };
5A17D65B130F76B4002C852F /* AIGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGradientView.h; path = Source/AIGradientView.h; sourceTree = "<group>"; };
5A17D65C130F76B4002C852F /* AIGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGradientView.m; path = Source/AIGradientView.m; sourceTree = "<group>"; };
- 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdvancedPreferencePane.h; path = "Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.h"; sourceTree = "<group>"; };
- 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdvancedPreferencePane.m; path = "Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m"; sourceTree = "<group>"; };
5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Xtras.xib"; path = "Resources/Preferences-Xtras.xib"; sourceTree = "<group>"; };
5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/AIFacebookXMPPAccountView.xib"; sourceTree = "<group>"; };
@@ -4167,8 +4143,6 @@
6334FFD10F9C14C1003C77A9 /* AIMenuAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMenuAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m"; sourceTree = "<group>"; };
6334FFD20F9C14C1003C77A9 /* AIMutableStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMutableStringAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIMutableStringAdditions.h"; sourceTree = "<group>"; };
6334FFD30F9C14C1003C77A9 /* AIMutableStringAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMutableStringAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AIMutableStringAdditions.m"; sourceTree = "<group>"; };
- 6334FFD40F9C14C1003C77A9 /* AIObjectAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIObjectAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIObjectAdditions.h"; sourceTree = "<group>"; };
- 6334FFD50F9C14C1003C77A9 /* AIObjectAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIObjectAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AIObjectAdditions.m"; sourceTree = "<group>"; };
6334FFD60F9C14C1003C77A9 /* AIOutlineViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOutlineViewAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIOutlineViewAdditions.h"; sourceTree = "<group>"; };
6334FFD70F9C14C1003C77A9 /* AIOutlineViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOutlineViewAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AIOutlineViewAdditions.m"; sourceTree = "<group>"; };
6334FFD80F9C14C1003C77A9 /* AIParagraphStyleAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIParagraphStyleAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIParagraphStyleAdditions.h"; sourceTree = "<group>"; };
@@ -4395,14 +4369,8 @@
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
- 76731DE015F90538007728C3 /* libgcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgcrypt.framework; path = Frameworks/libgcrypt.framework; sourceTree = "<group>"; };
- 76731DE115F90538007728C3 /* libgpgerror.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgpgerror.framework; path = Frameworks/libgpgerror.framework; sourceTree = "<group>"; };
76889DEA12D3CA17007AEF00 /* get-info.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info.tiff"; path = "Resources/get-info.tiff"; sourceTree = "<group>"; };
76889DEE12D3CA40007AEF00 /* Personal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Personal.tiff; path = Resources/Personal.tiff; sourceTree = "<group>"; };
- 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = im.adium.AIApplescriptRunner.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- 76B73B2014BE287D00A58BAB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
- 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIApplescriptRunner.m; path = Source/AIApplescriptRunner.m; sourceTree = SOURCE_ROOT; };
- 76B73B3514BE3BEB00A58BAB /* AIApplescriptRunner-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "AIApplescriptRunner-Info.plist"; path = "Plists/AIApplescriptRunner-Info.plist"; sourceTree = SOURCE_ROOT; };
76C1AF9A125A906A00D269A9 /* AIAdiumURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdiumURLProtocol.h; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.h"; sourceTree = "<group>"; };
76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdiumURLProtocol.m; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.m"; sourceTree = "<group>"; };
77D903500B78CF1000B86C42 /* zhm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = zhm; path = "Plugins/Purple Service/zhm"; sourceTree = "<group>"; };
@@ -4460,6 +4428,7 @@
979AA6B414D5A452008730DF /* libgobject.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgobject.framework; path = Frameworks/libgobject.framework; sourceTree = "<group>"; };
979AA6B514D5A452008730DF /* libgthread.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgthread.framework; path = Frameworks/libgthread.framework; sourceTree = "<group>"; };
979AA6B614D5A452008730DF /* libintl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libintl.framework; path = Frameworks/libintl.framework; sourceTree = "<group>"; };
+ 979AA6B714D5A452008730DF /* libjson-glib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "libjson-glib.framework"; path = "Frameworks/libjson-glib.framework"; sourceTree = "<group>"; };
979AA6B814D5A452008730DF /* libmeanwhile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libmeanwhile.framework; path = Frameworks/libmeanwhile.framework; sourceTree = "<group>"; };
979AA6B914D5A452008730DF /* libpurple.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpurple.framework; path = Frameworks/libpurple.framework; sourceTree = "<group>"; };
97AF5CD913191DE200550C41 /* AIContactListUserPictureMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactListUserPictureMenuController.h; path = Source/AIContactListUserPictureMenuController.h; sourceTree = "<group>"; };
@@ -4512,53 +4481,6 @@
C4D29CC10C3C2E3C001545A2 /* BGICLogImportController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BGICLogImportController.h; path = Source/BGICLogImportController.h; sourceTree = SOURCE_ROOT; };
C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGICLogImportController.m; path = Source/BGICLogImportController.m; sourceTree = SOURCE_ROOT; };
C4D29CC70C3C2E49001545A2 /* ICImport.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ICImport.xib; path = Resources/ICImport.xib; sourceTree = SOURCE_ROOT; };
- C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "AboutDialog_bg at 2x.png"; path = "Resources/AboutDialog_bg at 2x.png"; sourceTree = "<group>"; };
- C647215515F75E3700206892 /* stackImage at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stackImage at 2x.png"; path = "Frameworks/Adium Framework/stackImage at 2x.png"; sourceTree = "<group>"; };
- C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressReveal_Selected.png; path = Resources/FTProgressReveal_Selected.png; sourceTree = "<group>"; };
- C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressReveal_Selected at 2x.png"; path = "Resources/FTProgressReveal_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42A7615C5B7290032FAB3 /* FTProgressReveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressReveal.png; path = Resources/FTProgressReveal.png; sourceTree = "<group>"; };
- C6A42A7715C5B7290032FAB3 /* FTProgressReveal at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressReveal at 2x.png"; path = "Resources/FTProgressReveal at 2x.png"; sourceTree = "<group>"; };
- C6A42A7815C5B7290032FAB3 /* FTProgressRevealPressed_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressRevealPressed_Selected.png; path = Resources/FTProgressRevealPressed_Selected.png; sourceTree = "<group>"; };
- C6A42A7915C5B7290032FAB3 /* FTProgressRevealPressed_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressRevealPressed_Selected at 2x.png"; path = "Resources/FTProgressRevealPressed_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42A7A15C5B7290032FAB3 /* FTProgressRevealPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressRevealPressed.png; path = Resources/FTProgressRevealPressed.png; sourceTree = "<group>"; };
- C6A42A7B15C5B7290032FAB3 /* FTProgressRevealPressed at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressRevealPressed at 2x.png"; path = "Resources/FTProgressRevealPressed at 2x.png"; sourceTree = "<group>"; };
- C6A42A7C15C5B7290032FAB3 /* FTProgressRevealRollover_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressRevealRollover_Selected.png; path = Resources/FTProgressRevealRollover_Selected.png; sourceTree = "<group>"; };
- C6A42A7D15C5B7290032FAB3 /* FTProgressRevealRollover_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressRevealRollover_Selected at 2x.png"; path = "Resources/FTProgressRevealRollover_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42A7E15C5B7290032FAB3 /* FTProgressRevealRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressRevealRollover.png; path = Resources/FTProgressRevealRollover.png; sourceTree = "<group>"; };
- C6A42A7F15C5B7290032FAB3 /* FTProgressRevealRollover at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressRevealRollover at 2x.png"; path = "Resources/FTProgressRevealRollover at 2x.png"; sourceTree = "<group>"; };
- C6A42A8C15C5D6C20032FAB3 /* FTProgressResend_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressResend_Selected.png; path = Resources/FTProgressResend_Selected.png; sourceTree = "<group>"; };
- C6A42A8D15C5D6C20032FAB3 /* FTProgressResend_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressResend_Selected at 2x.png"; path = "Resources/FTProgressResend_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42A8E15C5D6C20032FAB3 /* FTProgressResend.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressResend.png; path = Resources/FTProgressResend.png; sourceTree = "<group>"; };
- C6A42A8F15C5D6C20032FAB3 /* FTProgressResend at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressResend at 2x.png"; path = "Resources/FTProgressResend at 2x.png"; sourceTree = "<group>"; };
- C6A42A9015C5D6C20032FAB3 /* FTProgressResendPressed_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressResendPressed_Selected.png; path = Resources/FTProgressResendPressed_Selected.png; sourceTree = "<group>"; };
- C6A42A9115C5D6C20032FAB3 /* FTProgressResendPressed_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressResendPressed_Selected at 2x.png"; path = "Resources/FTProgressResendPressed_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42A9215C5D6C30032FAB3 /* FTProgressResendPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressResendPressed.png; path = Resources/FTProgressResendPressed.png; sourceTree = "<group>"; };
- C6A42A9315C5D6C30032FAB3 /* FTProgressResendPressed at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressResendPressed at 2x.png"; path = "Resources/FTProgressResendPressed at 2x.png"; sourceTree = "<group>"; };
- C6A42A9415C5D6C30032FAB3 /* FTProgressResendRollover_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressResendRollover_Selected.png; path = Resources/FTProgressResendRollover_Selected.png; sourceTree = "<group>"; };
- C6A42A9515C5D6C30032FAB3 /* FTProgressResendRollover_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressResendRollover_Selected at 2x.png"; path = "Resources/FTProgressResendRollover_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42A9615C5D6C30032FAB3 /* FTProgressResendRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressResendRollover.png; path = Resources/FTProgressResendRollover.png; sourceTree = "<group>"; };
- C6A42A9715C5D6C30032FAB3 /* FTProgressResendRollover at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressResendRollover at 2x.png"; path = "Resources/FTProgressResendRollover at 2x.png"; sourceTree = "<group>"; };
- C6A42AA415C5DD780032FAB3 /* FTProgressStop_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStop_Selected.png; path = Resources/FTProgressStop_Selected.png; sourceTree = "<group>"; };
- C6A42AA515C5DD780032FAB3 /* FTProgressStop_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStop_Selected at 2x.png"; path = "Resources/FTProgressStop_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42AA615C5DD780032FAB3 /* FTProgressStop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStop.png; path = Resources/FTProgressStop.png; sourceTree = "<group>"; };
- C6A42AA715C5DD780032FAB3 /* FTProgressStop at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStop at 2x.png"; path = "Resources/FTProgressStop at 2x.png"; sourceTree = "<group>"; };
- C6A42AA815C5DD780032FAB3 /* FTProgressStopPressed_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStopPressed_Selected.png; path = Resources/FTProgressStopPressed_Selected.png; sourceTree = "<group>"; };
- C6A42AA915C5DD780032FAB3 /* FTProgressStopPressed_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopPressed_Selected at 2x.png"; path = "Resources/FTProgressStopPressed_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42AAA15C5DD780032FAB3 /* FTProgressStopPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStopPressed.png; path = Resources/FTProgressStopPressed.png; sourceTree = "<group>"; };
- C6A42AAB15C5DD780032FAB3 /* FTProgressStopPressed at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopPressed at 2x.png"; path = "Resources/FTProgressStopPressed at 2x.png"; sourceTree = "<group>"; };
- C6A42AAC15C5DD790032FAB3 /* FTProgressStopRollover_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStopRollover_Selected.png; path = Resources/FTProgressStopRollover_Selected.png; sourceTree = "<group>"; };
- C6A42AAD15C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopRollover_Selected at 2x.png"; path = "Resources/FTProgressStopRollover_Selected at 2x.png"; sourceTree = "<group>"; };
- C6A42AAE15C5DD790032FAB3 /* FTProgressStopRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStopRollover.png; path = Resources/FTProgressStopRollover.png; sourceTree = "<group>"; };
- C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopRollover at 2x.png"; path = "Resources/FTProgressStopRollover at 2x.png"; sourceTree = "<group>"; };
- C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundFileIcon at 2x.png"; path = "Resources/SoundFileIcon at 2x.png"; sourceTree = "<group>"; };
- C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ABSearch at 2x.png"; path = "Resources/ABSearch at 2x.png"; sourceTree = "<group>"; };
- C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "default-icon at 2x.png"; path = "Resources/default-icon at 2x.png"; sourceTree = "<group>"; };
- C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoticonBlank at 2x.png"; path = "Resources/emoticonBlank at 2x.png"; sourceTree = "<group>"; };
- C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebarActionWidget at 2x.png"; path = "Resources/sidebarActionWidget at 2x.png"; sourceTree = "<group>"; };
- C6EE434315C0AA8C00A4B96C /* SoundHigh at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundHigh at 2x.png"; path = "Resources/SoundHigh at 2x.png"; sourceTree = "<group>"; };
- C6EE434515C0AA9100A4B96C /* SoundLow at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundLow at 2x.png"; path = "Resources/SoundLow at 2x.png"; sourceTree = "<group>"; };
- C6EE434B15C0AB7400A4B96C /* Flap_192 at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Flap_192 at 2x.png"; path = "Resources/Flap_192 at 2x.png"; sourceTree = "<group>"; };
- C6EE434D15C0AB7F00A4B96C /* Awake_192 at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Awake_192 at 2x.png"; path = "Resources/Awake_192 at 2x.png"; sourceTree = "<group>"; };
D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-source-destination.tiff"; path = "Resources/msg-source-destination.tiff"; sourceTree = "<group>"; };
D182F1B411DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D182F1B611DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/schema.strings; sourceTree = "<group>"; };
@@ -4742,6 +4664,15 @@
811035180CDE783800EC6038 /* SecurityInterface.framework in Frameworks */,
633405990F9C2C00003C77A9 /* AIUtilities.framework in Frameworks */,
3485D8EB09EB446900232CC4 /* Adium.framework in Frameworks */,
+ 118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 349C2EF80867AC97000BF883 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 349C2FF00867AD65000BF883 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4777,11 +4708,10 @@
340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */,
31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */,
11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */,
+ 118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
34C846AF101E515900140B4B /* QTKit.framework in Frameworks */,
9719C92C1530EDF700217FBE /* FriBidi.framework in Frameworks */,
9719C92E1530EE0C00217FBE /* ShortcutRecorder.framework in Frameworks */,
- 76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */,
- 76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4822,14 +4752,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 76B73B1B14BE287D00A58BAB /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 76B73B2114BE287D00A58BAB /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -5057,11 +4979,11 @@
children = (
34BD9DA9053146CC000AB133 /* Adium.app */,
34BD9DE105314751000AB133 /* Adium.framework */,
+ 349C2EFA0867AC97000BF883 /* AdiumApplescriptRunner */,
3485D68009EB416300232CC4 /* AdiumLibpurple.framework */,
312ED3CA0C7E875B00A6BDA9 /* Unit tests.octest */,
6334FBFC0F9C11DC003C77A9 /* AIUtilities.framework */,
633D4FA40F9D3073004F491E /* AdiumSpotlightImporter.mdimporter */,
- 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */,
);
name = Products;
sourceTree = "<group>";
@@ -5081,7 +5003,7 @@
344458F3070B5BF500D8E932 /* Debugging */,
9EB3C52304F94DB7001D1F74 /* Source */,
F50A325A03B5798301A8010A /* Resources */,
- 76B73B2214BE287D00A58BAB /* AIApplescriptRunner */,
+ 349C2F310867ACF7000BF883 /* ApplescriptRunner */,
312ED3D80C7E89CC00A6BDA9 /* Unit tests */,
29B97323FDCFA39411CA2CEA /* Linked Frameworks */,
63C7E0280FAF9B7D00B310AC /* xcconfigs */,
@@ -5661,9 +5583,7 @@
4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */,
34C899AB07E51B18009357F6 /* BuiltInEventPresets.plist */,
34BFDF1607E8977D00AD984D /* SoundHigh.png */,
- C6EE434315C0AA8C00A4B96C /* SoundHigh at 2x.png */,
34BFDF1707E8977D00AD984D /* SoundLow.png */,
- C6EE434515C0AA9100A4B96C /* SoundLow at 2x.png */,
346BA3630774C35400628F06 /* GlobalEventsPreferences.xib */,
);
name = "Global Events Preferences";
@@ -5756,44 +5676,26 @@
349FE2FC074D01D200E36B3B /* ESFileTransferProgressWindowController.m */,
34D2E8670758BB0B0054C56D /* ESFileTransferPreferences.h */,
34D2E8680758BB0B0054C56D /* ESFileTransferPreferences.m */,
+ 117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */,
+ 117866D90EC759B9003E9B97 /* FTProgressResend.tif */,
+ 117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */,
+ 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */,
+ 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */,
+ 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */,
+ 34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */,
+ 34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */,
+ 34D8324A07CBD53A006466F2 /* FTProgressStopRollover_Selected.tif */,
+ 34D8324B07CBD53A006466F2 /* FTProgressStop_Selected.tif */,
+ 34D8324C07CBD53A006466F2 /* FTProgressStop.tif */,
+ 34D8324D07CBD53B006466F2 /* FTProgressStopRollover.tif */,
+ 34D8324E07CBD53B006466F2 /* FTProgressRevealPressed.tif */,
+ 34D8324F07CBD53B006466F2 /* FTProgressReveal_Selected.tif */,
+ 34D8325007CBD53B006466F2 /* FTProgressReveal.tif */,
+ 34D8325107CBD53B006466F2 /* FTProgressStopPressed_Selected.tif */,
+ 34D8325207CBD53B006466F2 /* FTProgressStopPressed.tif */,
+ 34D8325307CBD53B006466F2 /* FTProgressRevealPressed_Selected.tif */,
346935D30BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.h */,
346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */,
- C6A42AA415C5DD780032FAB3 /* FTProgressStop_Selected.png */,
- C6A42AA515C5DD780032FAB3 /* FTProgressStop_Selected at 2x.png */,
- C6A42AA615C5DD780032FAB3 /* FTProgressStop.png */,
- C6A42AA715C5DD780032FAB3 /* FTProgressStop at 2x.png */,
- C6A42AA815C5DD780032FAB3 /* FTProgressStopPressed_Selected.png */,
- C6A42AA915C5DD780032FAB3 /* FTProgressStopPressed_Selected at 2x.png */,
- C6A42AAA15C5DD780032FAB3 /* FTProgressStopPressed.png */,
- C6A42AAB15C5DD780032FAB3 /* FTProgressStopPressed at 2x.png */,
- C6A42AAC15C5DD790032FAB3 /* FTProgressStopRollover_Selected.png */,
- C6A42AAD15C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png */,
- C6A42AAE15C5DD790032FAB3 /* FTProgressStopRollover.png */,
- C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */,
- C6A42A8C15C5D6C20032FAB3 /* FTProgressResend_Selected.png */,
- C6A42A8D15C5D6C20032FAB3 /* FTProgressResend_Selected at 2x.png */,
- C6A42A8E15C5D6C20032FAB3 /* FTProgressResend.png */,
- C6A42A8F15C5D6C20032FAB3 /* FTProgressResend at 2x.png */,
- C6A42A9015C5D6C20032FAB3 /* FTProgressResendPressed_Selected.png */,
- C6A42A9115C5D6C20032FAB3 /* FTProgressResendPressed_Selected at 2x.png */,
- C6A42A9215C5D6C30032FAB3 /* FTProgressResendPressed.png */,
- C6A42A9315C5D6C30032FAB3 /* FTProgressResendPressed at 2x.png */,
- C6A42A9415C5D6C30032FAB3 /* FTProgressResendRollover_Selected.png */,
- C6A42A9515C5D6C30032FAB3 /* FTProgressResendRollover_Selected at 2x.png */,
- C6A42A9615C5D6C30032FAB3 /* FTProgressResendRollover.png */,
- C6A42A9715C5D6C30032FAB3 /* FTProgressResendRollover at 2x.png */,
- C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */,
- C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */,
- C6A42A7615C5B7290032FAB3 /* FTProgressReveal.png */,
- C6A42A7715C5B7290032FAB3 /* FTProgressReveal at 2x.png */,
- C6A42A7815C5B7290032FAB3 /* FTProgressRevealPressed_Selected.png */,
- C6A42A7915C5B7290032FAB3 /* FTProgressRevealPressed_Selected at 2x.png */,
- C6A42A7A15C5B7290032FAB3 /* FTProgressRevealPressed.png */,
- C6A42A7B15C5B7290032FAB3 /* FTProgressRevealPressed at 2x.png */,
- C6A42A7C15C5B7290032FAB3 /* FTProgressRevealRollover_Selected.png */,
- C6A42A7D15C5B7290032FAB3 /* FTProgressRevealRollover_Selected at 2x.png */,
- C6A42A7E15C5B7290032FAB3 /* FTProgressRevealRollover.png */,
- C6A42A7F15C5B7290032FAB3 /* FTProgressRevealRollover at 2x.png */,
);
name = "File Transfer";
sourceTree = "<group>";
@@ -5820,7 +5722,6 @@
11C157D804A88E04008E0C76 /* AIEmoticonController.h */,
11C157D904A88E04008E0C76 /* AIEmoticonController.m */,
34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */,
- C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */,
34A9707D0C96602200F46006 /* sidebarStatusAreaBackground.png */,
9E4CF9D104AA69B000415B22 /* Action Support */,
34F8A7FA05A8927F00577775 /* Applescript Filters */,
@@ -5943,6 +5844,14 @@
name = "Views and Cells";
sourceTree = "<group>";
};
+ 349C2F310867ACF7000BF883 /* ApplescriptRunner */ = {
+ isa = PBXGroup;
+ children = (
+ 349C2F460867AD16000BF883 /* ApplescriptRunner.m */,
+ );
+ name = ApplescriptRunner;
+ sourceTree = "<group>";
+ };
349C6E8207C9728B005EB896 /* Contact List */ = {
isa = PBXGroup;
children = (
@@ -6243,6 +6152,8 @@
isa = PBXGroup;
children = (
34D834CD07CBE7A3006466F2 /* Text field for previewing font preferences */,
+ 348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */,
+ 348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */,
);
name = "External Sources";
sourceTree = "<group>";
@@ -6396,7 +6307,6 @@
34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */,
34D8326607CBD598006466F2 /* ContactPrefs.plist */,
34D8326707CBD598006466F2 /* default-icon.png */,
- C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */,
34D8326207CBD598006466F2 /* DockPrefs.plist */,
3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */,
345F590608199746001F733C /* emoticon32_transparent.tiff */,
@@ -6696,8 +6606,6 @@
children = (
34BFE20007E8E11500AD984D /* AIChatCyclingPlugin.m */,
34BFE20107E8E11500AD984D /* AIChatCyclingPlugin.h */,
- 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */,
- 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */,
);
name = "Chat Cycling";
sourceTree = "<group>";
@@ -6748,7 +6656,6 @@
F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */,
F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */,
349DDD5206406A7D00542726 /* stackImage.png */,
- C647215515F75E3700206892 /* stackImage at 2x.png */,
);
name = Interface;
sourceTree = "<group>";
@@ -6969,7 +6876,6 @@
4B737B4B065D4FDC0062AB94 /* Emoticon Preferences */,
34C6A3BB077A8CB500EB423C /* AppearanceDefaults.plist */,
4BFC2E7807E357F00063D70C /* emoticonBlank.png */,
- C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */,
);
name = "Appearance Preferences";
sourceTree = "<group>";
@@ -7850,8 +7756,6 @@
6334FFD10F9C14C1003C77A9 /* AIMenuAdditions.m */,
6334FFD20F9C14C1003C77A9 /* AIMutableStringAdditions.h */,
6334FFD30F9C14C1003C77A9 /* AIMutableStringAdditions.m */,
- 6334FFD40F9C14C1003C77A9 /* AIObjectAdditions.h */,
- 6334FFD50F9C14C1003C77A9 /* AIObjectAdditions.m */,
6334FFD60F9C14C1003C77A9 /* AIOutlineViewAdditions.h */,
6334FFD70F9C14C1003C77A9 /* AIOutlineViewAdditions.m */,
6334FFD80F9C14C1003C77A9 /* AIParagraphStyleAdditions.h */,
@@ -8088,15 +7992,6 @@
name = "HTTP Server";
sourceTree = "<group>";
};
- 76B73B2214BE287D00A58BAB /* AIApplescriptRunner */ = {
- isa = PBXGroup;
- children = (
- 76B73B3514BE3BEB00A58BAB /* AIApplescriptRunner-Info.plist */,
- 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */,
- );
- path = AIApplescriptRunner;
- sourceTree = "<group>";
- };
7E824CCD06387FAF00813072 /* Link Management */ = {
isa = PBXGroup;
children = (
@@ -8155,8 +8050,6 @@
979AA6A914D59EF3008730DF /* Others */ = {
isa = PBXGroup;
children = (
- 76731DE015F90538007728C3 /* libgcrypt.framework */,
- 76731DE115F90538007728C3 /* libgpgerror.framework */,
3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */,
9719C92B1530EDF700217FBE /* FriBidi.framework */,
7E9A8CB2104DEBC400F210CC /* Growl.framework */,
@@ -8171,6 +8064,7 @@
979AA6B414D5A452008730DF /* libgobject.framework */,
979AA6B514D5A452008730DF /* libgthread.framework */,
979AA6B614D5A452008730DF /* libintl.framework */,
+ 979AA6B714D5A452008730DF /* libjson-glib.framework */,
979AA6B914D5A452008730DF /* libpurple.framework */,
979AA6B814D5A452008730DF /* libmeanwhile.framework */,
);
@@ -8413,11 +8307,8 @@
D3DA2E3E052E65DE00A8010B /* LNAboutBoxController.m */,
3402E02D07CB0DBB0044F818 /* AboutBox.xib */,
97E4B4FE13E7490000A8BA53 /* Awake_192.png */,
- C6EE434D15C0AB7F00A4B96C /* Awake_192 at 2x.png */,
97E4B4FD13E7490000A8BA53 /* Flap_192.png */,
- C6EE434B15C0AB7400A4B96C /* Flap_192 at 2x.png */,
9760D24513E49A560031FA1A /* AboutDialog_bg.png */,
- C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */,
97E4B4FB13E7490000A8BA53 /* AboutDialog_transp_btm.png */,
97E4B4FC13E7490000A8BA53 /* AboutDialog_transp_top.png */,
3474DFFC08254F3500BF30F0 /* Copyright.txt */,
@@ -8425,6 +8316,7 @@
3474DFFF082550FD00BF30F0 /* Credits.rtf */,
34107B5509E992DA001CC042 /* GuestAccountWindow.xib */,
34F849520A4AEFA00002A017 /* LogFileUpgrade.xib */,
+ 34483A980BC869680083723B /* AdvancedPreferences.xib */,
);
name = "About Box";
sourceTree = "<group>";
@@ -8580,8 +8472,8 @@
isa = PBXGroup;
children = (
EE147A6C0896B18700A21377 /* ABSearch.png */,
- C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */,
347E787207CA975900350507 /* msg-add-contact.tiff */,
+ 347E787607CA975900350507 /* importContacts.png */,
);
name = Images;
sourceTree = "<group>";
@@ -8702,7 +8594,6 @@
34A6FB2507D6F97B00972830 /* EventSoundContactAlert.xib */,
34A6FB2B07D6F98600972830 /* events-sound-alert.tiff */,
34A6FB2C07D6F98600972830 /* SoundFileIcon.png */,
- C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */,
);
name = Sound;
sourceTree = "<group>";
@@ -8737,8 +8628,6 @@
4BAA1B360632ED8B00D8B92C /* AIActionDetailsPane.m */,
F5793923033E74C301A8010A /* AIPreferencePane.h */,
F5793913033E748F01A8010A /* AIPreferencePane.m */,
- 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */,
- 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */,
4BAD188C066A83550002008E /* AIModularPaneCategoryView.h */,
4BAD188D066A83550002008E /* AIModularPaneCategoryView.m */,
);
@@ -9022,6 +8911,7 @@
34DC8B030A7EEEF7003E1636 /* ESFileWrapperExtension.h in Headers */,
34DC8B0A0A7EEEF7003E1636 /* JVFontPreviewField.h in Headers */,
3482E0F50AB5064E00471992 /* AIAdiumProtocol.h in Headers */,
+ 34F312930ADC3FE800A4310E /* KNShelfSplitView.h in Headers */,
11CA00100C35EC5100A6BB8D /* SS_PreferencePaneProtocol.h in Headers */,
34A88E190C7A26E1006EB7D4 /* AIPasswordPromptController.h in Headers */,
347933F30C861017007ADCAA /* AIColorStringTransformer.h in Headers */,
@@ -9040,7 +8930,6 @@
34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
979AA6A714D59DC8008730DF /* AIBoolToControlTextColorTransformer.h in Headers */,
- 5A1E24A915BC746B003A6F9E /* AIAdvancedPreferencePane.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9111,7 +9000,6 @@
633400990F9C14C2003C77A9 /* AIImageDrawingAdditions.h in Headers */,
6334009B0F9C14C2003C77A9 /* AIMenuAdditions.h in Headers */,
6334009D0F9C14C2003C77A9 /* AIMutableStringAdditions.h in Headers */,
- 6334009F0F9C14C2003C77A9 /* AIObjectAdditions.h in Headers */,
633400A10F9C14C2003C77A9 /* AIOutlineViewAdditions.h in Headers */,
633400A30F9C14C2003C77A9 /* AIParagraphStyleAdditions.h in Headers */,
633400A50F9C14C2003C77A9 /* AIPopUpButtonAdditions.h in Headers */,
@@ -9189,6 +9077,22 @@
productReference = 3485D68009EB416300232CC4 /* AdiumLibpurple.framework */;
productType = "com.apple.product-type.framework";
};
+ 349C2EF90867AC97000BF883 /* AdiumApplescriptRunner */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 349C2F220867ACA9000BF883 /* Build configuration list for PBXNativeTarget "AdiumApplescriptRunner" */;
+ buildPhases = (
+ 349C2EF70867AC97000BF883 /* Sources */,
+ 349C2EF80867AC97000BF883 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = AdiumApplescriptRunner;
+ productName = ApplescriptRunner;
+ productReference = 349C2EFA0867AC97000BF883 /* AdiumApplescriptRunner */;
+ productType = "com.apple.product-type.tool";
+ };
34BD9CD1053146CC000AB133 /* Adium */ = {
isa = PBXNativeTarget;
buildConfigurationList = DADE8E22085507450062B664 /* Build configuration list for PBXNativeTarget "Adium" */;
@@ -9201,15 +9105,14 @@
4BF2E91F067CB76300743318 /* Copy Built-in Xtras */,
34BD9D6A053146CC000AB133 /* Copy AdiumPlugins */,
345DFF4A05564DB200CEE7B3 /* Run Generate Buildnum File Script */,
- 76B73B2F14BE294900A58BAB /* CopyFiles */,
);
buildRules = (
81F9D1DF0A7F81A5004A35BD /* PBXBuildRule */,
);
dependencies = (
- 76B73B3214BE2A5200A58BAB /* PBXTargetDependency */,
11F6CB2E109BC6AC0070022D /* PBXTargetDependency */,
639DF9E30F97E687003C9A32 /* PBXTargetDependency */,
+ 349C31630867D199000BF883 /* PBXTargetDependency */,
6329EFB50F9D33A600112489 /* PBXTargetDependency */,
F5B17CDF0A16C767004AE99E /* PBXTargetDependency */,
);
@@ -9277,23 +9180,6 @@
productReference = 633D4FA40F9D3073004F491E /* AdiumSpotlightImporter.mdimporter */;
productType = "com.apple.product-type.bundle";
};
- 76B73B1D14BE287D00A58BAB /* AIApplescriptRunner */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 76B73B2B14BE287D00A58BAB /* Build configuration list for PBXNativeTarget "AIApplescriptRunner" */;
- buildPhases = (
- 76B73B1A14BE287D00A58BAB /* Sources */,
- 76B73B1B14BE287D00A58BAB /* Frameworks */,
- 76B73B1C14BE287D00A58BAB /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = AIApplescriptRunner;
- productName = AIApplescriptRunner;
- productReference = 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */;
- productType = "com.apple.product-type.bundle";
- };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -9301,9 +9187,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
- CLASSPREFIX = AI;
- LastUpgradeCheck = 0430;
- ORGANIZATIONNAME = "The Adium Team";
+ LastUpgradeCheck = 0440;
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.2";
@@ -9362,12 +9246,12 @@
34BD9DAF05314751000AB133 /* Adium.Framework */,
3485D67F09EB416300232CC4 /* AdiumLibpurple */,
6334FBFB0F9C11DC003C77A9 /* AIUtilities.framework */,
+ 349C2EF90867AC97000BF883 /* AdiumApplescriptRunner */,
F5B17CCF0A16C6AC004AE99E /* Plist Macros */,
F53C25AE0A2F95F100F7B73D /* Setup Build Directory */,
34F3B9510BDF15F40011AB34 /* Touch Framework Bundles to Executable Date */,
312ED3C90C7E875B00A6BDA9 /* Unit tests */,
633D4FA30F9D3073004F491E /* Spotlight Importer */,
- 76B73B1D14BE287D00A58BAB /* AIApplescriptRunner */,
);
};
/* End PBXProject section */
@@ -9497,6 +9381,7 @@
9EF0DBFA09D944C200FBCC1E /* msg-block-contact.tiff in Resources */,
9EF0DBFB09D944C200FBCC1E /* msg-unblock-contact.tiff in Resources */,
346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
+ 349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
34E0EA0807CC53ED00A82198 /* NewMessagePrompt.xib in Resources */,
347E781A07CA962100350507 /* events-contact.png in Resources */,
347E783407CA967100350507 /* SortingDefaults.plist in Resources */,
@@ -9628,6 +9513,18 @@
34DC88590A7EEE2E003E1636 /* FileTransferProgressWindow.xib in Resources */,
34DC885A0A7EEE2E003E1636 /* FileTransferPrefs.plist in Resources */,
34DC885B0A7EEE2E003E1636 /* FileTransferPrefs.xib in Resources */,
+ 34DC88650A7EEE2F003E1636 /* FTProgressRevealRollover.tif in Resources */,
+ 34DC88660A7EEE2F003E1636 /* FTProgressRevealRollover_Selected.tif in Resources */,
+ 34DC88670A7EEE2F003E1636 /* FTProgressStopRollover_Selected.tif in Resources */,
+ 34DC88680A7EEE2F003E1636 /* FTProgressStop_Selected.tif in Resources */,
+ 34DC88690A7EEE2F003E1636 /* FTProgressStop.tif in Resources */,
+ 34DC886A0A7EEE2F003E1636 /* FTProgressStopRollover.tif in Resources */,
+ 34DC886B0A7EEE2F003E1636 /* FTProgressRevealPressed.tif in Resources */,
+ 34DC886C0A7EEE2F003E1636 /* FTProgressReveal_Selected.tif in Resources */,
+ 34DC886D0A7EEE2F003E1636 /* FTProgressReveal.tif in Resources */,
+ 34DC886E0A7EEE2F003E1636 /* FTProgressStopPressed_Selected.tif in Resources */,
+ 34DC886F0A7EEE2F003E1636 /* FTProgressStopPressed.tif in Resources */,
+ 34DC88700A7EEE2F003E1636 /* FTProgressRevealPressed_Selected.tif in Resources */,
34DC88780A7EEE2F003E1636 /* AdiumyButler.png in Resources */,
34DC88790A7EEE2F003E1636 /* SetupWizard.xib in Resources */,
34DC88820A7EEE2F003E1636 /* SoundPrefs.plist in Resources */,
@@ -9651,6 +9548,7 @@
117D6DC00BC5F0C40080D02B /* msg-request-attention.tiff in Resources */,
344838690BC85EF70083723B /* AccountListPreferences.xib in Resources */,
344839380BC862780083723B /* pref-messages.tiff in Resources */,
+ 34483A990BC869680083723B /* AdvancedPreferences.xib in Resources */,
07C6EA890C06676400B79CBD /* AdiumHelp in Resources */,
0CAC6A140C0C657A0090AE95 /* Adium.sdef in Resources */,
C4D29CC80C3C2E49001545A2 /* ICImport.xib in Resources */,
@@ -9671,6 +9569,12 @@
34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib in Resources */,
34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib in Resources */,
317D83680E89F40500298BDB /* msg-bookmark-chat.tiff in Resources */,
+ 117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */,
+ 117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */,
+ 117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */,
+ 117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */,
+ 117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */,
+ 117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */,
11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */,
11BD73D40F5A54BB007D438A /* twitter.png in Resources */,
1109634C0F61C1D00064CA0E /* AITwitterReplyWindow.xib in Resources */,
@@ -9722,54 +9626,6 @@
5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */,
97F7B38014E29BC500A0F6F8 /* facebook-small.png in Resources */,
97F7B38114E29BC500A0F6F8 /* facebook.png in Resources */,
- C6EE433E15C0A9BC00A4B96C /* default-icon at 2x.png in Resources */,
- C6EE434015C0AA4600A4B96C /* emoticonBlank at 2x.png in Resources */,
- C6EE434215C0AA6F00A4B96C /* sidebarActionWidget at 2x.png in Resources */,
- C6EE434415C0AA8C00A4B96C /* SoundHigh at 2x.png in Resources */,
- C6EE434615C0AA9100A4B96C /* SoundLow at 2x.png in Resources */,
- C6EE434C15C0AB7400A4B96C /* Flap_192 at 2x.png in Resources */,
- C6EE434E15C0AB7F00A4B96C /* Awake_192 at 2x.png in Resources */,
- C6A42A8015C5B7290032FAB3 /* FTProgressReveal_Selected.png in Resources */,
- C6A42A8115C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png in Resources */,
- C6A42A8215C5B7290032FAB3 /* FTProgressReveal.png in Resources */,
- C6A42A8315C5B7290032FAB3 /* FTProgressReveal at 2x.png in Resources */,
- C6A42A8415C5B7290032FAB3 /* FTProgressRevealPressed_Selected.png in Resources */,
- C6A42A8515C5B7290032FAB3 /* FTProgressRevealPressed_Selected at 2x.png in Resources */,
- C6A42A8615C5B7290032FAB3 /* FTProgressRevealPressed.png in Resources */,
- C6A42A8715C5B7290032FAB3 /* FTProgressRevealPressed at 2x.png in Resources */,
- C6A42A8815C5B7290032FAB3 /* FTProgressRevealRollover_Selected.png in Resources */,
- C6A42A8915C5B7290032FAB3 /* FTProgressRevealRollover_Selected at 2x.png in Resources */,
- C6A42A8A15C5B7290032FAB3 /* FTProgressRevealRollover.png in Resources */,
- C6A42A8B15C5B7290032FAB3 /* FTProgressRevealRollover at 2x.png in Resources */,
- C6A42A9815C5D6C30032FAB3 /* FTProgressResend_Selected.png in Resources */,
- C6A42A9915C5D6C30032FAB3 /* FTProgressResend_Selected at 2x.png in Resources */,
- C6A42A9A15C5D6C30032FAB3 /* FTProgressResend.png in Resources */,
- C6A42A9B15C5D6C30032FAB3 /* FTProgressResend at 2x.png in Resources */,
- C6A42A9C15C5D6C30032FAB3 /* FTProgressResendPressed_Selected.png in Resources */,
- C6A42A9D15C5D6C30032FAB3 /* FTProgressResendPressed_Selected at 2x.png in Resources */,
- C6A42A9E15C5D6C30032FAB3 /* FTProgressResendPressed.png in Resources */,
- C6A42A9F15C5D6C30032FAB3 /* FTProgressResendPressed at 2x.png in Resources */,
- C6A42AA015C5D6C30032FAB3 /* FTProgressResendRollover_Selected.png in Resources */,
- C6A42AA115C5D6C30032FAB3 /* FTProgressResendRollover_Selected at 2x.png in Resources */,
- C6A42AA215C5D6C30032FAB3 /* FTProgressResendRollover.png in Resources */,
- C6A42AA315C5D6C30032FAB3 /* FTProgressResendRollover at 2x.png in Resources */,
- C6A42AB015C5DD790032FAB3 /* FTProgressStop_Selected.png in Resources */,
- C6A42AB115C5DD790032FAB3 /* FTProgressStop_Selected at 2x.png in Resources */,
- C6A42AB215C5DD790032FAB3 /* FTProgressStop.png in Resources */,
- C6A42AB315C5DD790032FAB3 /* FTProgressStop at 2x.png in Resources */,
- C6A42AB415C5DD790032FAB3 /* FTProgressStopPressed_Selected.png in Resources */,
- C6A42AB515C5DD790032FAB3 /* FTProgressStopPressed_Selected at 2x.png in Resources */,
- C6A42AB615C5DD790032FAB3 /* FTProgressStopPressed.png in Resources */,
- C6A42AB715C5DD790032FAB3 /* FTProgressStopPressed at 2x.png in Resources */,
- C6A42AB815C5DD790032FAB3 /* FTProgressStopRollover_Selected.png in Resources */,
- C6A42AB915C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png in Resources */,
- C6A42ABA15C5DD790032FAB3 /* FTProgressStopRollover.png in Resources */,
- C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png in Resources */,
- C6B545A815D338EE0005F1F8 /* SoundFileIcon at 2x.png in Resources */,
- C6B545AA15D3390F0005F1F8 /* ABSearch at 2x.png in Resources */,
- C61AFA9A15DD43C80001EDEF /* AboutDialog_bg at 2x.png in Resources */,
- 34D7F1EA15F85DD300F32F9B /* ChatCyclingDefaults-Old.plist in Resources */,
- 34D7F1EB15F85DD300F32F9B /* ChatCyclingDefaults.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9805,7 +9661,6 @@
1199AB0610BE13E600646322 /* Authorize.tiff in Resources */,
1199AB0710BE13E600646322 /* Deny.tiff in Resources */,
1199AB0810BE13E600646322 /* Ignore.tiff in Resources */,
- C699374B15F75FB2007EFFA0 /* stackImage at 2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9827,13 +9682,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 76B73B1C14BE287D00A58BAB /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@@ -10078,6 +9926,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 349C2EF70867AC97000BF883 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 349C2F470867AD16000BF883 /* ApplescriptRunner.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
34BD9D42053146CC000AB133 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -10503,6 +10359,7 @@
34DC8B020A7EEEF7003E1636 /* ESFileTransfer.m in Sources */,
More information about the commits
mailing list