adium 5068:1c76587d9cf9: Merged adium-1.5.4 into adium-1.6.
commits at adium.im
commits at adium.im
Thu Sep 13 10:15:55 UTC 2012
details: http://hg.adium.im/adium/rev/1c76587d9cf9
revision: 5068:1c76587d9cf9
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Sep 13 11:49:39 2012 +0200
Merged adium-1.5.4 into adium-1.6.
Subject: adium 5069:87d9e57c3a04: Merged adium-1.6 into default.
details: http://hg.adium.im/adium/rev/87d9e57c3a04
revision: 5069:87d9e57c3a04
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Sep 13 12:15:18 2012 +0200
Merged adium-1.6 into default.
diffs (truncated from 46300 to 1000 lines):
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Sep 13 11:41:00 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Thu Sep 13 12:15:18 2012 +0200
@@ -527,7 +527,6 @@
3485DBCA09EBCE7400232CC4 /* ESPurpleRequestActionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 341E88680648FF1B00E0C828 /* ESPurpleRequestActionController.h */; settings = {ATTRIBUTES = (Public, ); }; };
3485DBCB09EBCE7400232CC4 /* ESPurpleRequestActionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 341E88690648FF1B00E0C828 /* ESPurpleRequestActionController.m */; };
3485DBD009EBCE8200232CC4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3402E04D07CB0EB00044F818 /* Localizable.strings */; };
- 34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */; };
348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */; };
348F57940936F3CC00288E41 /* ESEditStatusGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348F57920936F3CC00288E41 /* ESEditStatusGroupWindowController.m */; };
348F579E0936FA6D00288E41 /* EditStatusGroup.xib in Resources */ = {isa = PBXBuildFile; fileRef = 348F579D0936FA6D00288E41 /* EditStatusGroup.xib */; };
@@ -536,9 +535,6 @@
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 */; };
@@ -547,7 +543,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 */; };
@@ -629,6 +625,8 @@
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 +637,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 */; };
@@ -790,7 +788,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 +796,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, ); }; };
@@ -1226,7 +1224,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, ); }; };
@@ -1245,8 +1243,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, ); }; };
@@ -1365,6 +1361,9 @@
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 */; };
76FF925A14B524B40043E23B /* AIIRCConsoleController.h in Headers */ = {isa = PBXBuildFile; fileRef = 76FF925814B524B40043E23B /* AIIRCConsoleController.h */; };
76FF925B14B524B40043E23B /* AIIRCConsoleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76FF925914B524B40043E23B /* AIIRCConsoleController.m */; };
@@ -1427,7 +1426,6 @@
9E124DEC07D34C7300AA91C5 /* CBGrowlAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E124DE807D34C7300AA91C5 /* CBGrowlAlertDetailPane.m */; };
9E124DEE07D34C7400AA91C5 /* NEHGrowlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */; };
9E124DF107D34C9100AA91C5 /* GrowlAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */; };
- 9E124DF207D34C9100AA91C5 /* events-growl-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 9E124DF007D34C9000AA91C5 /* events-growl-alert.tiff */; };
9E125C6607D3571400AA91C5 /* ESBlockingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E125C6407D3571400AA91C5 /* ESBlockingPlugin.m */; };
9E1E1DFD0A96741500E16DFC /* LMX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1E1DFC0A96741500E16DFC /* LMX.framework */; };
9E1E1E270A96770C00E16DFC /* LMX.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1E1DFC0A96741500E16DFC /* LMX.framework */; };
@@ -1482,6 +1480,7 @@
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 */; };
+ C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */; };
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 */; };
@@ -1564,13 +1563,6 @@
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 */;
@@ -1620,6 +1612,13 @@
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 */;
@@ -1714,6 +1713,16 @@
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;
@@ -2948,8 +2957,6 @@
348839210BB0E7BB009C3F7C /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path = Resources/zh_CN.lproj/InfoPlist.strings; sourceTree = "<group>"; };
348862CD05645E94003C9627 /* ESFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESFileTransfer.h; path = "Frameworks/Adium Framework/Source/ESFileTransfer.h"; sourceTree = "<group>"; };
348862CE05645E95003C9627 /* ESFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESFileTransfer.m; path = "Frameworks/Adium Framework/Source/ESFileTransfer.m"; sourceTree = "<group>"; };
- 34891C120D4B75EE00AEF48C /* AIStandardListScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIStandardListScrollView.h; path = Source/AIStandardListScrollView.h; sourceTree = "<group>"; };
- 34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIStandardListScrollView.m; path = Source/AIStandardListScrollView.m; sourceTree = "<group>"; };
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>"; };
@@ -3006,8 +3013,6 @@
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>"; };
@@ -3399,6 +3404,8 @@
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>"; };
@@ -4155,8 +4162,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>"; };
@@ -4387,6 +4392,10 @@
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>"; };
76FF925814B524B40043E23B /* AIIRCConsoleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIIRCConsoleController.h; path = "Plugins/Purple Service/AIIRCConsoleController.h"; sourceTree = "<group>"; };
@@ -4466,7 +4475,6 @@
9E124DE907D34C7300AA91C5 /* NEHGrowlPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NEHGrowlPlugin.h; path = Source/NEHGrowlPlugin.h; sourceTree = "<group>"; };
9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NEHGrowlPlugin.m; path = Source/NEHGrowlPlugin.m; sourceTree = "<group>"; };
9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = GrowlAlert.xib; path = Resources/GrowlAlert.xib; sourceTree = "<group>"; };
- 9E124DF007D34C9000AA91C5 /* events-growl-alert.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-growl-alert.tiff"; path = "Resources/events-growl-alert.tiff"; sourceTree = "<group>"; };
9E125C6307D3571400AA91C5 /* ESBlockingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESBlockingPlugin.h; path = Source/ESBlockingPlugin.h; sourceTree = "<group>"; };
9E125C6407D3571400AA91C5 /* ESBlockingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESBlockingPlugin.m; path = Source/ESBlockingPlugin.m; sourceTree = "<group>"; };
9E1E1DFC0A96741500E16DFC /* LMX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LMX.framework; path = Frameworks/LMX.framework; sourceTree = "<group>"; };
@@ -4541,6 +4549,7 @@
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>"; };
+ C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-notification.tiff"; path = "Resources/events-notification.tiff"; 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>"; };
@@ -4734,14 +4743,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 349C2EF80867AC97000BF883 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 349C2FF00867AD65000BF883 /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
34BD9D57053146CC000AB133 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -4819,6 +4820,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 76B73B1B14BE287D00A58BAB /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 76B73B2114BE287D00A58BAB /* Foundation.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -5046,11 +5055,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>";
@@ -5070,7 +5079,7 @@
344458F3070B5BF500D8E932 /* Debugging */,
9EB3C52304F94DB7001D1F74 /* Source */,
F50A325A03B5798301A8010A /* Resources */,
- 349C2F310867ACF7000BF883 /* ApplescriptRunner */,
+ 76B73B2214BE287D00A58BAB /* AIApplescriptRunner */,
312ED3D80C7E89CC00A6BDA9 /* Unit tests */,
29B97323FDCFA39411CA2CEA /* Linked Frameworks */,
63C7E0280FAF9B7D00B310AC /* xcconfigs */,
@@ -5930,14 +5939,6 @@
name = "Views and Cells";
sourceTree = "<group>";
};
- 349C2F310867ACF7000BF883 /* ApplescriptRunner */ = {
- isa = PBXGroup;
- children = (
- 349C2F460867AD16000BF883 /* ApplescriptRunner.m */,
- );
- name = ApplescriptRunner;
- sourceTree = "<group>";
- };
349C6E8207C9728B005EB896 /* Contact List */ = {
isa = PBXGroup;
children = (
@@ -6693,6 +6694,8 @@
children = (
34BFE20007E8E11500AD984D /* AIChatCyclingPlugin.m */,
34BFE20107E8E11500AD984D /* AIChatCyclingPlugin.h */,
+ 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */,
+ 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */,
);
name = "Chat Cycling";
sourceTree = "<group>";
@@ -7213,8 +7216,6 @@
34607EE709B228FE000DB3D2 /* AIContactListNameButton.m */,
34AE249B09BCCFA900A35B51 /* AIWindowDraggingView.h */,
34AE249C09BCCFA900A35B51 /* AIWindowDraggingView.m */,
- 34891C120D4B75EE00AEF48C /* AIStandardListScrollView.h */,
- 34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */,
);
name = "Standard Window";
sourceTree = "<group>";
@@ -7269,10 +7270,10 @@
children = (
9E124DE707D34C7300AA91C5 /* CBGrowlAlertDetailPane.h */,
9E124DE807D34C7300AA91C5 /* CBGrowlAlertDetailPane.m */,
- 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */,
- 9E124DF007D34C9000AA91C5 /* events-growl-alert.tiff */,
9E124DE907D34C7300AA91C5 /* NEHGrowlPlugin.h */,
9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */,
+ 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */,
+ C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */,
);
name = Growl;
sourceTree = "<group>";
@@ -7847,8 +7848,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 */,
@@ -8085,6 +8084,15 @@
name = "HTTP Server";
sourceTree = "<group>";
};
+ 76B73B2214BE287D00A58BAB /* AIApplescriptRunner */ = {
+ isa = PBXGroup;
+ children = (
+ 76B73B3514BE3BEB00A58BAB /* AIApplescriptRunner-Info.plist */,
+ 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */,
+ );
+ path = AIApplescriptRunner;
+ sourceTree = "<group>";
+ };
76FF925C14B60B4B0043E23B /* Console */ = {
isa = PBXGroup;
children = (
@@ -9110,7 +9118,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 */,
@@ -9188,22 +9195,6 @@
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" */;
@@ -9216,14 +9207,15 @@
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 */,
);
@@ -9291,6 +9283,23 @@
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 */
@@ -9298,9 +9307,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";
@@ -9359,12 +9366,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 */
@@ -9492,7 +9499,6 @@
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 */,
@@ -9571,7 +9577,6 @@
342838EE07D2D004004F01C9 /* Shared Dock Icon Images in Resources */,
4BB5B78207D2DC4900CFE06F /* pref-status.tiff in Resources */,
9E124DF107D34C9100AA91C5 /* GrowlAlert.xib in Resources */,
- 9E124DF207D34C9100AA91C5 /* events-growl-alert.tiff in Resources */,
34A6FB2607D6F97B00972830 /* EventSoundContactAlert.xib in Resources */,
34A6FB2D07D6F98600972830 /* events-sound-alert.tiff in Resources */,
34A6FB2E07D6F98600972830 /* SoundFileIcon.png in Resources */,
@@ -9764,6 +9769,9 @@
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 */,
+ C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9822,6 +9830,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 76B73B1C14BE287D00A58BAB /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@@ -10067,14 +10082,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 349C2EF70867AC97000BF883 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 349C2F470867AD16000BF883 /* ApplescriptRunner.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
34BD9D42053146CC000AB133 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -10345,7 +10352,6 @@
347F4B810D340F16006D5A56 /* AIPreferenceContainer.m in Sources */,
0CFA98C90D35C18000A077C6 /* NSDataAdditions.m in Sources */,
348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources */,
- 34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources */,
4F1CB6260D640D5C0073A1E6 /* AIContactInfoContentController.m in Sources */,
4F1CB6290D640D680073A1E6 /* AIInfoInspectorPane.m in Sources */,
4F1CB62E0D640D770073A1E6 /* AIAdvancedInspectorPane.m in Sources */,
@@ -10590,7 +10596,6 @@
6334009A0F9C14C2003C77A9 /* AIImageDrawingAdditions.m in Sources */,
6334009C0F9C14C2003C77A9 /* AIMenuAdditions.m in Sources */,
6334009E0F9C14C2003C77A9 /* AIMutableStringAdditions.m in Sources */,
- 633400A00F9C14C2003C77A9 /* AIObjectAdditions.m in Sources */,
633400A20F9C14C2003C77A9 /* AIOutlineViewAdditions.m in Sources */,
633400A40F9C14C2003C77A9 /* AIParagraphStyleAdditions.m in Sources */,
633400A60F9C14C2003C77A9 /* AIPopUpButtonAdditions.m in Sources */,
@@ -10632,6 +10637,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 76B73B1A14BE287D00A58BAB /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 76B73B3414BE3B9400A58BAB /* AIApplescriptRunner.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -10655,11 +10668,6 @@
target = 34BD9DAF05314751000AB133 /* Adium.Framework */;
targetProxy = 340BAB4E09EC6FA7000EC441 /* PBXContainerItemProxy */;
};
- 349C31630867D199000BF883 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 349C2EF90867AC97000BF883 /* AdiumApplescriptRunner */;
- targetProxy = 349C31620867D199000BF883 /* PBXContainerItemProxy */;
- };
6329EFB50F9D33A600112489 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 633D4FA30F9D3073004F491E /* Spotlight Importer */;
@@ -10695,6 +10703,11 @@
target = F53C25AE0A2F95F100F7B73D /* Setup Build Directory */;
targetProxy = 63DE4C520F9C77D50034ED3A /* PBXContainerItemProxy */;
};
+ 76B73B3214BE2A5200A58BAB /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 76B73B1D14BE287D00A58BAB /* AIApplescriptRunner */;
+ targetProxy = 76B73B3114BE2A5200A58BAB /* PBXContainerItemProxy */;
+ };
F5B17CDF0A16C767004AE99E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F5B17CCF0A16C6AC004AE99E /* Plist Macros */;
@@ -12220,27 +12233,6 @@
};
name = "Release-Debug";
};
- 349C2F230867ACA9000BF883 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63C7E11A0FAFA35E00B310AC /* AdiumApplescriptRunner.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- 349C2F240867ACA9000BF883 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63C7E11A0FAFA35E00B310AC /* AdiumApplescriptRunner.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- 349C2F250867ACA9000BF883 /* Release-Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 63C7E11A0FAFA35E00B310AC /* AdiumApplescriptRunner.xcconfig */;
- buildSettings = {
- };
- name = "Release-Debug";
- };
34F3B95B0BDF16130011AB34 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
@@ -12304,6 +12296,88 @@
};
name = "Release-Debug";
};
+ 76B73B2C14BE287D00A58BAB /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ COPY_PHASE_STRIP = NO;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ INFOPLIST_FILE = "Plists/AIApplescriptRunner-Info.plist";
+ MACH_O_TYPE = mh_execute;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ ONLY_ACTIVE_ARCH = YES;
+ PRODUCT_NAME = "im.adium.$(TARGET_NAME)";
+ SDKROOT = macosx;
+ WRAPPER_EXTENSION = xpc;
+ };
+ name = Debug;
+ };
+ 76B73B2D14BE287D00A58BAB /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ INFOPLIST_FILE = "Plists/AIApplescriptRunner-Info.plist";
+ MACH_O_TYPE = mh_execute;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ PRODUCT_NAME = "im.adium.$(TARGET_NAME)";
+ SDKROOT = macosx;
+ WRAPPER_EXTENSION = xpc;
+ };
+ name = Release;
+ };
+ 76B73B2E14BE287D00A58BAB /* Release-Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ INFOPLIST_FILE = "Plists/AIApplescriptRunner-Info.plist";
+ MACH_O_TYPE = mh_execute;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ PRODUCT_NAME = "im.adium.$(TARGET_NAME)";
+ SDKROOT = macosx;
+ WRAPPER_EXTENSION = xpc;
+ };
+ name = "Release-Debug";
+ };
DADE8E00085507450062B664 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
@@ -12334,7 +12408,6 @@
"\"$(SRCROOT)/Frameworks\"",
"\"$(SRCROOT)/build/Debug\"",
);
- MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = Debug;
};
@@ -12348,7 +12421,6 @@
"\"$(SRCROOT)/build/Debug\"",
);
GCC_PREPROCESSOR_DEFINITIONS = RELEASE_BUILD;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = Release;
};
@@ -12365,7 +12437,6 @@
RELEASE_BUILD,
DEBUG_BUILD,
);
- MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = "Release-Debug";
};
@@ -12458,16 +12529,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 349C2F220867ACA9000BF883 /* Build configuration list for PBXNativeTarget "AdiumApplescriptRunner" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 349C2F230867ACA9000BF883 /* Debug */,
- 349C2F240867ACA9000BF883 /* Release */,
- 349C2F250867ACA9000BF883 /* Release-Debug */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
34F3B95A0BDF16130011AB34 /* Build configuration list for PBXAggregateTarget "Touch Framework Bundles to Executable Date" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -12498,6 +12559,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ 76B73B2B14BE287D00A58BAB /* Build configuration list for PBXNativeTarget "AIApplescriptRunner" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 76B73B2C14BE287D00A58BAB /* Debug */,
+ 76B73B2D14BE287D00A58BAB /* Release */,
+ 76B73B2E14BE287D00A58BAB /* Release-Debug */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
DADE8DFF085507450062B664 /* Build configuration list for PBXNativeTarget "Adium.Framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff -r 79d3c3d2d748 -r 87d9e57c3a04 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Thu Sep 13 11:41:00 2012 +0200
+++ b/ChangeLogs/Changes.txt Thu Sep 13 12:15:18 2012 +0200
@@ -1,11 +1,12 @@
Adium Version History
-----------------------
Version 1.5.4 (XX/XX/XXXX)
+ * Changed the default tab switching shortcuts for new users to Control-Tab/Control-Shift-Tab, to match Safari. (#16102)
+ * Limit the tracking of the last seen time to contacts who are on your contact list.
* Updated the included Growl SDK to 2.0, adding support for Notification Center on 10.8 if Growl is not installed. (#15867)
* Updated libotr to 3.2.1, fixing a security vulnerability. (#16122)
* Fixed a problem where accepting a group chat invite on Sametime 8.5.1 would crash Adium. (Jere Krischel and Jonathan Rice) (#16114)
- * Limit the tracking of the last seen time to contacts who are on your contact list.
- * Changed the default tab switching shortcuts for new users to Control-Tab/Control-Shift-Tab, to match Safari. (#16102)
+ * Fixed a problem where accepting a group chat invite on HipChat's XMPP server would crash Adium. (#16007)
Version 1.5.3 (8/12/2012)
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIAlternatingRowOutlineView.h
--- a/Frameworks/AIUtilities Framework/Source/AIAlternatingRowOutlineView.h Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIAlternatingRowOutlineView.h Thu Sep 13 12:15:18 2012 +0200
@@ -34,7 +34,7 @@
*
* Ignored if usesAlternatingRowBackgroundColors is NO.
*/
- at property (readwrite, nonatomic, retain) NSColor *alternatingRowColor;
+ at property (weak, readwrite, nonatomic) NSColor *alternatingRowColor;
/*!
* @brief Whether the outlineView should draw its background
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIAlternatingRowOutlineView.m
--- a/Frameworks/AIUtilities Framework/Source/AIAlternatingRowOutlineView.m Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIAlternatingRowOutlineView.m Thu Sep 13 12:15:18 2012 +0200
@@ -59,17 +59,9 @@
[self setUsesAlternatingRowBackgroundColors:NO];
drawsBackground = YES;
drawsGradientSelection = NO;
- alternatingRowColor = [[NSColor colorWithCalibratedRed:(237.0f/255.0f) green:(243.0f/255.0f) blue:(254.0f/255.0f) alpha:1.0f] retain];
+ alternatingRowColor = [NSColor colorWithCalibratedRed:(237.0f/255.0f) green:(243.0f/255.0f) blue:(254.0f/255.0f) alpha:1.0f];
}
-- (void)dealloc
-{
- [alternatingRowColor release];
-
- [super dealloc];
-}
-
-
//Configuring ----------------------------------------------------------------------
- (void)setDrawsGradientSelection:(BOOL)inDrawsGradientSelection
@@ -87,8 +79,7 @@
- (void)setAlternatingRowColor:(NSColor *)color
{
if (color != alternatingRowColor) {
- [alternatingRowColor release];
- alternatingRowColor = [color retain];
+ alternatingRowColor = color;
[self setNeedsDisplay:YES];
}
}
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h Thu Sep 13 12:15:18 2012 +0200
@@ -18,6 +18,4 @@
- (NSString *)applicationVersion;
-- (BOOL)isOnLionOrNewer;
-
@end
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m Thu Sep 13 12:15:18 2012 +0200
@@ -16,12 +16,6 @@
#import "AIApplicationAdditions.h"
-// Make sure the version number defines exist; when compiling on 10.6, NSAppKitVersionNumber10_6 isn't defined
-#ifndef NSAppKitVersionNumber10_6
-#define NSAppKitVersionNumber10_6 1038
-#endif
-
-
@implementation NSApplication (AIApplicationAdditions)
- (NSString *)applicationVersion
@@ -29,9 +23,4 @@
return [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey];
}
-- (BOOL)isOnLionOrNewer
-{
- return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6);
-}
-
@end
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h Thu Sep 13 12:15:18 2012 +0200
@@ -22,6 +22,5 @@
@end
@interface NSMutableArray (ESArrayAdditions)
-- (void)addObjectsFromArrayIgnoringDuplicates:(NSArray *)inArray;
- (void)moveObject:(id)object toIndex:(NSUInteger)newIndex;
@end
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIArrayAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.m Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.m Thu Sep 13 12:15:18 2012 +0200
@@ -26,16 +26,7 @@
// Returns an array from the owners bundle with the specified name
+ (NSArray *)arrayNamed:(NSString *)name forClass:(Class)inClass
{
- NSBundle *ownerBundle;
- NSString *arrayPath;
-
- //Get the bundle
- ownerBundle = [NSBundle bundleForClass:inClass];
-
- //Open the plist file
- arrayPath = [ownerBundle pathForResource:name ofType:@"plist"];
-
- return [[[NSArray alloc] initWithContentsOfFile:arrayPath] autorelease];
+ return [NSArray arrayWithContentsOfURL:[[NSBundle bundleForClass:inClass] URLForResource:name withExtension:@"plist"]];
}
- (NSComparisonResult)compare:(NSArray *)other
@@ -98,13 +89,6 @@
@implementation NSMutableArray (ESArrayAdditions)
-- (void)addObjectsFromArrayIgnoringDuplicates:(NSArray *)inArray
-{
- for (id obj in inArray) {
- if (![self containsObject:obj]) [self addObject:obj];
- }
-}
-
- (void)moveObject:(id)object toIndex:(NSUInteger)newIndex
{
NSUInteger currentIndex = [self indexOfObject:object];
diff -r 79d3c3d2d748 -r 87d9e57c3a04 Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m Thu Sep 13 11:41:00 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m Thu Sep 13 12:15:18 2012 +0200
@@ -43,7 +43,6 @@
}
[self appendAttributedString:tempString];
- [tempString release];
}
- (NSUInteger)replaceOccurrencesOfString:(NSString *)target withString:(NSString*)replacement options:(NSStringCompareOptions)opts range:(NSRange)searchRange
@@ -85,8 +84,6 @@
break;
}
- [replacementString release];
-
return numberOfReplacements;
}
@@ -289,7 +286,7 @@
if ([self length] && [self containsAttachments]) {
NSInteger currentLocation = 0;
NSRange attachmentRange;
- NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",NSAttachmentCharacter];
+ NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C", (unichar)NSAttachmentCharacter];
//find attachment
attachmentRange = [[self string] rangeOfString:attachmentCharacterString
@@ -411,15 +408,15 @@
#define FONT_HEIGHT_STRING @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789()"
+ (CGFloat)stringHeightForAttributes:(NSDictionary *)attributes
{
- NSAttributedString *string = [[[NSAttributedString alloc] initWithString:FONT_HEIGHT_STRING
- attributes:attributes] autorelease];
+ NSAttributedString *string = [[NSAttributedString alloc] initWithString:FONT_HEIGHT_STRING
+ attributes:attributes];
return [string heightWithWidth:1e7f];
}
+ (NSAttributedString *)stringWithString:(NSString *)inString
{
NSParameterAssert(inString != nil);
- return [[[NSAttributedString alloc] initWithString:inString] autorelease];
+ return [[NSAttributedString alloc] initWithString:inString];
}
+ (NSAttributedString *)attributedStringWithString:(NSString *)inString linkRange:(NSRange)linkRange linkDestination:(id)inLink
@@ -432,7 +429,7 @@
NSParameterAssert(inLink != nil);
NSParameterAssert([inLink isKindOfClass:[NSURL class]]);
- NSMutableAttributedString *attributedString = [[[NSMutableAttributedString alloc] initWithString:inString] autorelease];
+ NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:inString];
//Throws NSInvalidArgumentException if the range is out-of-range.
[attributedString addAttribute:NSLinkAttributeName value:inLink range:linkRange];
@@ -449,7 +446,7 @@
NSParameterAssert([inLink isKindOfClass:[NSURL class]]);
NSDictionary *attributes = [NSDictionary dictionaryWithObject:inLink forKey:NSLinkAttributeName];
- return [[[self alloc] initWithString:inString attributes:attributes] autorelease];
+ return [[self alloc] initWithString:inString attributes:attributes];
}
- (CGFloat)heightWithWidth:(CGFloat)width
@@ -469,9 +466,6 @@
CGFloat height = [layoutManager usedRectForTextContainer:textContainer].size.height;
- [textStorage release];
- [textContainer release];
- [layoutManager release];
return height;
}
@@ -500,7 +494,7 @@
* when the unarchiver is deallocated. We could rely upon autoreleasing the unarchiver, but it
* is cleaner to make the NSAttributedString autorelease itself.
*/
- returnValue = (NSAttributedString *)[[[unarchiver decodeObject] retain] autorelease];
+ returnValue = (NSAttributedString *)[unarchiver decodeObject];
} else {
/* For reading previously stored NSData objects - we used to store them as RTF data, but that
@@ -508,11 +502,10 @@
* here isn't a speed problem. We previously used AIHTMLDecoder to handle Jaguar old-data unarchiving...
* but that's in Adium.framework and the cross over most certainly isn't worth it.
*/
- returnValue = ([[[NSAttributedString alloc] initWithRTF:inData
- documentAttributes:nil] autorelease]);
+ returnValue = ([[NSAttributedString alloc] initWithRTF:inData
+ documentAttributes:nil]);
}
- [unarchiver release];
}
}
@catch(id exc) { }
@@ -523,7 +516,7 @@
- (NSAttributedString *)attributedStringByConvertingAttachmentsToStrings
{
if ([self length] && [self containsAttachments]) {
- NSMutableAttributedString *newAttributedString = [[self mutableCopy] autorelease];
+ NSMutableAttributedString *newAttributedString = [self mutableCopy];
[newAttributedString convertAttachmentsToStringsUsingPlaceholder:AILocalizedString(@"<<Attachment>>", nil)];
return newAttributedString;
@@ -556,7 +549,7 @@
if (URL) {
if (!newAttributedString) {
- newAttributedString = [[self mutableCopy] autorelease];
+ newAttributedString = [self mutableCopy];
currentAttributedString = newAttributedString;
}
@@ -588,7 +581,7 @@
}
}
- return (newAttributedString ? newAttributedString : [[self copy] autorelease]);
+ return (newAttributedString ? newAttributedString : [self copy]);
}
- (NSAttributedString *)attributedStringByConvertingLinksToStrings
@@ -604,7 +597,7 @@
{
NSMutableAttributedString *str = [self mutableCopy];
[str addFormattingForLinks];
- return [str autorelease];
+ return str;
}
More information about the commits
mailing list