adium 5426:c700a188cfbb: Merged adium-1.6 into libotr4.0.0.
commits at adium.im
commits at adium.im
Wed Apr 17 18:26:36 UTC 2013
details: http://hg.adium.im/adium/rev/c700a188cfbb
revision: 5426:c700a188cfbb
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Apr 17 20:24:54 2013 +0200
Merged adium-1.6 into libotr4.0.0.
diffs (truncated from 445506 to 1000 lines):
diff -r dd73ec06e6d6 -r c700a188cfbb .hgtags
--- a/.hgtags Wed Jan 23 13:08:47 2013 +0100
+++ b/.hgtags Wed Apr 17 20:24:54 2013 +0200
@@ -2,3 +2,7 @@
64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
8d4ed0d28f89a09c3deb3b4b1952e21cd4a5e563 1.5.2
c436f536180fc12b1c2f70ae31e29a2b32b4529f 1.5.4
+5efcd11df6947cf82c763a8024229d5a326d9c56 adium-1.5.4
+0000000000000000000000000000000000000000 adium-1.5.4
+90a171a6b0fc033ebeba46112223e20fcee0a004 1.5.6
+fc2294917bf61da7cf8c1560db443fe29e2acfb8 1.5.5
diff -r dd73ec06e6d6 -r c700a188cfbb Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Wed Jan 23 13:08:47 2013 +0100
+++ b/Adium.xcodeproj/project.pbxproj Wed Apr 17 20:24:54 2013 +0200
@@ -107,17 +107,12 @@
112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */; };
1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.tiff */; };
1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.tiff */; };
- 113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891820F6B6AFF00A7D7DC /* AILaconicaService.m */; };
- 1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891890F6B6B2800A7D7DC /* AILaconicaAccount.m */; };
- 1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1138918C0F6B6B3F00A7D7DC /* AILaconicaPlugin.m */; };
- 113891950F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891940F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m */; };
113892270F6B70CA00A7D7DC /* laconica-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892250F6B70CA00A7D7DC /* laconica-small.png */; };
113892280F6B70CA00A7D7DC /* laconica.png in Resources */ = {isa = PBXBuildFile; fileRef = 113892260F6B70CA00A7D7DC /* laconica.png */; };
113900B10F85BEF60081A418 /* AIURLHandlerPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 113900B00F85BEF60081A418 /* AIURLHandlerPreferences.xib */; };
113900B40F85BF880081A418 /* AIURLHandlerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 113900B30F85BF880081A418 /* AIURLHandlerWindowController.m */; };
1139011C0F85C9450081A418 /* AIURLHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139011B0F85C9450081A418 /* AIURLHandlerPlugin.m */; };
1139FFAA0F85260E0081A418 /* AIIRCChannelLinker.m in Sources */ = {isa = PBXBuildFile; fileRef = 1139FFA90F85260E0081A418 /* AIIRCChannelLinker.m */; };
- 113F26A00F5CC03F00954772 /* AITwitterURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 113F269F0F5CC03F00954772 /* AITwitterURLParser.m */; };
114849B90F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 114849B70F7841C600EA5264 /* AIAuthorizationRequestsWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; };
114849BA0F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 114849B80F7841C600EA5264 /* AIAuthorizationRequestsWindowController.m */; };
114849BC0F78420300EA5264 /* AIAuthorizationRequestsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 114849BB0F78420300EA5264 /* AIAuthorizationRequestsWindow.xib */; };
@@ -141,9 +136,6 @@
1172FBD10CDAA8D400B8E233 /* libpurple.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
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 */; };
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 */; };
@@ -187,15 +179,6 @@
11F738F90F58D18700B3285B /* AITwitterService.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738F80F58D18700B3285B /* AITwitterService.m */; };
11F738FC0F58D19B00B3285B /* AITwitterPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F738FB0F58D19B00B3285B /* AITwitterPlugin.m */; };
11F739020F58D1C400B3285B /* AITwitterAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739010F58D1C400B3285B /* AITwitterAccountViewController.m */; };
- 11F7397A0F58D4DC00B3285B /* MGTwitterEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395B0F58D4DC00B3285B /* MGTwitterEngine.m */; };
- 11F7397B0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7395F0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m */; };
- 11F7397E0F58D4DD00B3285B /* MGTwitterMessagesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739650F58D4DC00B3285B /* MGTwitterMessagesParser.m */; };
- 11F739800F58D4DD00B3285B /* MGTwitterMiscParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739690F58D4DC00B3285B /* MGTwitterMiscParser.m */; };
- 11F739820F58D4DD00B3285B /* MGTwitterStatusesParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F7396F0F58D4DC00B3285B /* MGTwitterStatusesParser.m */; };
- 11F739840F58D4DD00B3285B /* MGTwitterUsersParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739730F58D4DC00B3285B /* MGTwitterUsersParser.m */; };
- 11F739850F58D4DD00B3285B /* MGTwitterXMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739750F58D4DC00B3285B /* MGTwitterXMLParser.m */; };
- 11F739860F58D4DD00B3285B /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739770F58D4DC00B3285B /* NSData+Base64.m */; };
- 11F739870F58D4DD00B3285B /* NSString+UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F739790F58D4DC00B3285B /* NSString+UUID.m */; };
11FC23C20F768C1600C1C906 /* AIXMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 11FC23BF0F768C0900C1C906 /* AIXMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
11FC23C30F768C2900C1C906 /* AIXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 11FC23C00F768C0900C1C906 /* AIXMLElement.m */; };
31034EFF0C8142680003F5AA /* TestStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31034EFE0C8142680003F5AA /* TestStringAdditions.m */; };
@@ -1036,12 +1019,18 @@
4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */; };
4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */; };
4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
+ 5A0D236A16F4C7BC005DF211 /* STTwitterAppOnly.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A0D236816F4C7BC005DF211 /* STTwitterAppOnly.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.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 */; };
5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7A14A272330063489D /* pref-messagestyle.png */; };
+ 5A3B4D7916D878AC00903E40 /* NSString+STTwitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D6C16D878AB00903E40 /* NSString+STTwitter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A3B4D7A16D878AC00903E40 /* STTwitterAPIWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D6E16D878AB00903E40 /* STTwitterAPIWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A3B4D7C16D878AC00903E40 /* STTwitterOAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D7216D878AB00903E40 /* STTwitterOAuth.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A3B4D7E16D878AC00903E40 /* STHTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D7816D878AC00903E40 /* STHTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A44595E169143130078AB0A /* AIPreferenceCVPrototypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A445957169118C60078AB0A /* AIPreferenceCVPrototypeView.m */; };
+ 5A4B77E916FBDDC700DF398C /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A4B77E716FBDDC600DF398C /* NSData+Base64.m */; };
5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
@@ -1348,6 +1337,9 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
+ 761CE33916F9087C000EE361 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 761CE33816F9087C000EE361 /* Cocoa.framework */; };
+ 761CE34E16F90950000EE361 /* AIDockTilePlugin.docktileplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */; };
+ 761CE35416F90A03000EE361 /* AIDockTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 761CE35316F90A03000EE361 /* AIDockTile.m */; };
761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D587F1636C60100210B12 /* AINewMessageTableView.m */; };
761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */; };
761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58851636F94200210B12 /* AINewMessageSearchField.m */; };
@@ -1375,7 +1367,7 @@
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 */; };
- 76FF926414B62A980043E23B /* AIConsole.nib in Resources */ = {isa = PBXBuildFile; fileRef = 76FF926314B62A980043E23B /* AIConsole.nib */; };
+ 76FF926414B62A980043E23B /* AIConsole.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76FF926314B62A980043E23B /* AIConsole.xib */; };
76FF926714B62AB80043E23B /* AIConsoleController.h in Headers */ = {isa = PBXBuildFile; fileRef = 76FF926514B62AB80043E23B /* AIConsoleController.h */; settings = {ATTRIBUTES = (Public, ); }; };
76FF926814B62AB80043E23B /* AIConsoleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76FF926614B62AB80043E23B /* AIConsoleController.m */; };
7E6F8A94105611B700C6D80D /* libotr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
@@ -1642,6 +1634,13 @@
remoteGlobalIDString = F53C25AE0A2F95F100F7B73D;
remoteInfo = "Setup Build Directory";
};
+ 761CE34F16F9098E000EE361 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 761CE33516F9087C000EE361;
+ remoteInfo = AIDockTilePlugin;
+ };
7E78DA9B0DD135DE00B9388F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */;
@@ -1676,7 +1675,6 @@
116E369A10B72934002EDB0F /* Growl.framework in Copy Frameworks */,
633404710F9C18EF003C77A9 /* AIUtilities.framework in Copy Frameworks */,
639DF9D80F97E678003C9A32 /* AdiumLibpurple.framework in Copy Frameworks */,
- 11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */,
11EE1CCF0CDD01120097F246 /* libglib.framework in Copy Frameworks */,
11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */,
11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */,
@@ -1737,6 +1735,16 @@
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE34D16F90938000EE361 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 13;
+ files = (
+ 761CE34E16F90950000EE361 /* AIDockTilePlugin.docktileplugin in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
F51BCD3E0A156281000FDC06 /* Copy Spotlight Importer */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -1832,8 +1840,6 @@
1139FFA90F85260E0081A418 /* AIIRCChannelLinker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIIRCChannelLinker.m; path = Source/AIIRCChannelLinker.m; sourceTree = "<group>"; };
113E06A910D0ABA0005D5B9A /* adiumPurpleMedia.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = adiumPurpleMedia.m; path = "Plugins/Purple Service/adiumPurpleMedia.m"; sourceTree = "<group>"; };
113E06AE10D0ABE3005D5B9A /* adiumPurpleMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adiumPurpleMedia.h; path = "Plugins/Purple Service/adiumPurpleMedia.h"; sourceTree = "<group>"; };
- 113F269E0F5CC03F00954772 /* AITwitterURLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITwitterURLParser.h; path = "Plugins/Twitter Plugin/AITwitterURLParser.h"; sourceTree = "<group>"; };
- 113F269F0F5CC03F00954772 /* AITwitterURLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITwitterURLParser.m; path = "Plugins/Twitter Plugin/AITwitterURLParser.m"; sourceTree = "<group>"; };
1147FCC210D1CB4C004E9E8D /* AIMediaWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMediaWindowController.h; path = Source/AIMediaWindowController.h; sourceTree = "<group>"; };
1147FCC310D1CB4C004E9E8D /* AIMediaWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMediaWindowController.m; path = Source/AIMediaWindowController.m; sourceTree = "<group>"; };
1147FCC710D1CB83004E9E8D /* AIMediaWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AIMediaWindow.xib; path = Resources/AIMediaWindow.xib; sourceTree = "<group>"; };
@@ -1892,9 +1898,6 @@
11819A0210D0B8BE003E8ECA /* AIMediaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMediaController.h; path = Source/AIMediaController.h; sourceTree = "<group>"; };
11819A0310D0B8BE003E8ECA /* AIMediaController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMediaController.m; path = Source/AIMediaController.m; sourceTree = "<group>"; };
11819A0910D0B90E003E8ECA /* AIMediaControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMediaControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIMediaControllerProtocol.h"; sourceTree = "<group>"; };
- 11879C090F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITwitterAccountOAuthSetup.h; path = "Plugins/Twitter Plugin/AITwitterAccountOAuthSetup.h"; sourceTree = "<group>"; };
- 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITwitterAccountOAuthSetup.m; path = "Plugins/Twitter Plugin/AITwitterAccountOAuthSetup.m"; sourceTree = "<group>"; };
- 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OAuthConsumer.framework; path = Frameworks/OAuthConsumer.framework; sourceTree = "<group>"; };
118A444F0FEEA828008153C0 /* libjson-glib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "libjson-glib.framework"; path = "Frameworks/libjson-glib.framework"; sourceTree = "<group>"; };
1192E6B10FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAnnoyingIRCMessagesHiderPlugin.h; path = "Plugins/Purple Service/AIAnnoyingIRCMessagesHiderPlugin.h"; sourceTree = "<group>"; };
1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAnnoyingIRCMessagesHiderPlugin.m; path = "Plugins/Purple Service/AIAnnoyingIRCMessagesHiderPlugin.m"; sourceTree = "<group>"; };
@@ -1971,28 +1974,6 @@
11F738FB0F58D19B00B3285B /* AITwitterPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITwitterPlugin.m; path = "Plugins/Twitter Plugin/AITwitterPlugin.m"; sourceTree = "<group>"; };
11F739000F58D1C300B3285B /* AITwitterAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITwitterAccountViewController.h; path = "Plugins/Twitter Plugin/AITwitterAccountViewController.h"; sourceTree = "<group>"; };
11F739010F58D1C400B3285B /* AITwitterAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITwitterAccountViewController.m; path = "Plugins/Twitter Plugin/AITwitterAccountViewController.m"; sourceTree = "<group>"; };
- 11F7395A0F58D4DC00B3285B /* MGTwitterEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterEngine.h; sourceTree = "<group>"; };
- 11F7395B0F58D4DC00B3285B /* MGTwitterEngine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterEngine.m; sourceTree = "<group>"; };
- 11F7395C0F58D4DC00B3285B /* MGTwitterEngineDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterEngineDelegate.h; sourceTree = "<group>"; };
- 11F7395D0F58D4DC00B3285B /* MGTwitterEngineGlobalHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterEngineGlobalHeader.h; sourceTree = "<group>"; };
- 11F7395E0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterHTTPURLConnection.h; sourceTree = "<group>"; };
- 11F7395F0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterHTTPURLConnection.m; sourceTree = "<group>"; };
- 11F739640F58D4DC00B3285B /* MGTwitterMessagesParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterMessagesParser.h; sourceTree = "<group>"; };
- 11F739650F58D4DC00B3285B /* MGTwitterMessagesParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterMessagesParser.m; sourceTree = "<group>"; };
- 11F739680F58D4DC00B3285B /* MGTwitterMiscParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterMiscParser.h; sourceTree = "<group>"; };
- 11F739690F58D4DC00B3285B /* MGTwitterMiscParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterMiscParser.m; sourceTree = "<group>"; };
- 11F7396A0F58D4DC00B3285B /* MGTwitterParserDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterParserDelegate.h; sourceTree = "<group>"; };
- 11F7396B0F58D4DC00B3285B /* MGTwitterRequestTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterRequestTypes.h; sourceTree = "<group>"; };
- 11F7396E0F58D4DC00B3285B /* MGTwitterStatusesParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterStatusesParser.h; sourceTree = "<group>"; };
- 11F7396F0F58D4DC00B3285B /* MGTwitterStatusesParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterStatusesParser.m; sourceTree = "<group>"; };
- 11F739720F58D4DC00B3285B /* MGTwitterUsersParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterUsersParser.h; sourceTree = "<group>"; };
- 11F739730F58D4DC00B3285B /* MGTwitterUsersParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterUsersParser.m; sourceTree = "<group>"; };
- 11F739740F58D4DC00B3285B /* MGTwitterXMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTwitterXMLParser.h; sourceTree = "<group>"; };
- 11F739750F58D4DC00B3285B /* MGTwitterXMLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTwitterXMLParser.m; sourceTree = "<group>"; };
- 11F739760F58D4DC00B3285B /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
- 11F739770F58D4DC00B3285B /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
- 11F739780F58D4DC00B3285B /* NSString+UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+UUID.h"; sourceTree = "<group>"; };
- 11F739790F58D4DC00B3285B /* NSString+UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+UUID.m"; sourceTree = "<group>"; };
11FC23BF0F768C0900C1C906 /* AIXMLElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIXMLElement.h; path = "Frameworks/Adium Framework/Source/AIXMLElement.h"; sourceTree = "<group>"; };
11FC23C00F768C0900C1C906 /* AIXMLElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIXMLElement.m; path = "Frameworks/Adium Framework/Source/AIXMLElement.m"; sourceTree = "<group>"; };
31034EFD0C8142680003F5AA /* TestStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestStringAdditions.h; path = UnitTests/TestStringAdditions.h; sourceTree = "<group>"; };
@@ -3886,6 +3867,8 @@
4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-advanced.tiff"; path = "Resources/get-info-advanced.tiff"; sourceTree = "<group>"; };
4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-events.tiff"; path = "Resources/get-info-events.tiff"; sourceTree = "<group>"; };
4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ContactInfoInspector.xib; path = Resources/ContactInfoInspector.xib; sourceTree = "<group>"; };
+ 5A0D236816F4C7BC005DF211 /* STTwitterAppOnly.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = STTwitterAppOnly.m; path = "Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.m"; sourceTree = "<group>"; };
+ 5A0D236916F4C7BC005DF211 /* STTwitterAppOnly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STTwitterAppOnly.h; path = "Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.h"; sourceTree = "<group>"; };
5A1781840EC1215D00BA1E04 /* AIAutoScrollTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAutoScrollTextView.h; path = Source/AIAutoScrollTextView.h; sourceTree = "<group>"; };
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>"; };
@@ -3896,8 +3879,20 @@
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>"; };
5A27FA7A14A272330063489D /* pref-messagestyle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagestyle.png"; path = "Resources/pref-messagestyle.png"; sourceTree = "<group>"; };
+ 5A3B4D6B16D878AB00903E40 /* NSString+STTwitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+STTwitter.h"; path = "Plugins/Twitter Plugin/STTwitter/NSString+STTwitter.h"; sourceTree = "<group>"; };
+ 5A3B4D6C16D878AB00903E40 /* NSString+STTwitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+STTwitter.m"; path = "Plugins/Twitter Plugin/STTwitter/NSString+STTwitter.m"; sourceTree = "<group>"; };
+ 5A3B4D6D16D878AB00903E40 /* STTwitterAPIWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STTwitterAPIWrapper.h; path = "Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.h"; sourceTree = "<group>"; };
+ 5A3B4D6E16D878AB00903E40 /* STTwitterAPIWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = STTwitterAPIWrapper.m; path = "Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m"; sourceTree = "<group>"; };
+ 5A3B4D7116D878AB00903E40 /* STTwitterOAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STTwitterOAuth.h; path = "Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.h"; sourceTree = "<group>"; };
+ 5A3B4D7216D878AB00903E40 /* STTwitterOAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = STTwitterOAuth.m; path = "Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m"; sourceTree = "<group>"; };
+ 5A3B4D7516D878AB00903E40 /* STTwitterOAuthProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STTwitterOAuthProtocol.h; path = "Plugins/Twitter Plugin/STTwitter/STTwitterOAuthProtocol.h"; sourceTree = "<group>"; };
+ 5A3B4D7716D878AC00903E40 /* STHTTPRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STHTTPRequest.h; path = "Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.h"; sourceTree = "<group>"; };
+ 5A3B4D7816D878AC00903E40 /* STHTTPRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = STHTTPRequest.m; path = "Plugins/Twitter Plugin/STTwitter/Vendor/STHTTPRequest.m"; sourceTree = "<group>"; };
5A445956169118C60078AB0A /* AIPreferenceCVPrototypeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPreferenceCVPrototypeView.h; path = Source/AIPreferenceCVPrototypeView.h; sourceTree = "<group>"; };
5A445957169118C60078AB0A /* AIPreferenceCVPrototypeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPreferenceCVPrototypeView.m; path = Source/AIPreferenceCVPrototypeView.m; sourceTree = "<group>"; };
+ 5A4B77E716FBDDC600DF398C /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSData+Base64.m"; path = "Plugins/Twitter Plugin/STTwitter/NSData+Base64.m"; sourceTree = "<group>"; };
+ 5A4B77E816FBDDC700DF398C /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSData+Base64.h"; path = "Plugins/Twitter Plugin/STTwitter/NSData+Base64.h"; sourceTree = "<group>"; };
+ 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Dock Tile Plugin.xcconfig"; sourceTree = "<group>"; };
5A4BD41C13F855B000A4D3F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = Resources/en.lproj/SearchTerms.plist; sourceTree = "<group>"; };
5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-ContactList.xib"; path = "Resources/Preferences-ContactList.xib"; sourceTree = "<group>"; };
5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-WindowHandling.xib"; path = "Resources/Preferences-WindowHandling.xib"; sourceTree = "<group>"; };
@@ -4393,6 +4388,15 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+ 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AIDockTilePlugin.docktileplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+ 761CE33816F9087C000EE361 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+ 761CE33B16F9087C000EE361 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+ 761CE33C16F9087C000EE361 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+ 761CE33D16F9087C000EE361 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ 761CE34016F9087D000EE361 /* AIDockTilePlugin-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AIDockTilePlugin-Info.plist"; sourceTree = "<group>"; };
+ 761CE34416F9087D000EE361 /* AIDockTilePlugin-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AIDockTilePlugin-Prefix.pch"; sourceTree = "<group>"; };
+ 761CE35216F90A03000EE361 /* AIDockTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDockTile.h; path = Source/AIDockTile.h; sourceTree = "<group>"; };
+ 761CE35316F90A03000EE361 /* AIDockTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIDockTile.m; path = Source/AIDockTile.m; sourceTree = "<group>"; };
761D587E1636C60100210B12 /* AINewMessageTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTableView.h; path = Source/AINewMessageTableView.h; sourceTree = "<group>"; };
761D587F1636C60100210B12 /* AINewMessageTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTableView.m; path = Source/AINewMessageTableView.m; sourceTree = "<group>"; };
761D58811636EDE100210B12 /* AINewMessageTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTextFieldCell.h; path = Source/AINewMessageTextFieldCell.h; sourceTree = "<group>"; };
@@ -4428,7 +4432,7 @@
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>"; };
76FF925914B524B40043E23B /* AIIRCConsoleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIIRCConsoleController.m; path = "Plugins/Purple Service/AIIRCConsoleController.m"; sourceTree = "<group>"; };
- 76FF926314B62A980043E23B /* AIConsole.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AIConsole.nib; path = "Frameworks/Adium Framework/Resources/AIConsole.nib"; sourceTree = "<group>"; };
+ 76FF926314B62A980043E23B /* AIConsole.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AIConsole.xib; path = "Frameworks/Adium Framework/Resources/AIConsole.xib"; sourceTree = "<group>"; };
76FF926514B62AB80043E23B /* AIConsoleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIConsoleController.h; path = "Frameworks/Adium Framework/Source/AIConsoleController.h"; sourceTree = "<group>"; };
76FF926614B62AB80043E23B /* AIConsoleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIConsoleController.m; path = "Frameworks/Adium Framework/Source/AIConsoleController.m"; sourceTree = "<group>"; };
77D903500B78CF1000B86C42 /* zhm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = zhm; path = "Plugins/Purple Service/zhm"; sourceTree = "<group>"; };
@@ -4825,7 +4829,6 @@
11AA1EFA0BCAE9C3003DDA66 /* Quartz.framework in Frameworks */,
340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */,
31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */,
- 11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */,
34C846AF101E515900140B4B /* QTKit.framework in Frameworks */,
9719C92C1530EDF700217FBE /* FriBidi.framework in Frameworks */,
9719C92E1530EE0C00217FBE /* ShortcutRecorder.framework in Frameworks */,
@@ -4872,6 +4875,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE33316F9087C000EE361 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 761CE33916F9087C000EE361 /* Cocoa.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -5032,7 +5043,7 @@
11F738F40F58D15500B3285B /* Twitter */ = {
isa = PBXGroup;
children = (
- 11F739590F58D4DC00B3285B /* MGTwitterEngine */,
+ 5A3B4D6A16D878AB00903E40 /* STTwitter */,
113891850F6B6B0300A7D7DC /* Laconica */,
1197F66F0FCF8D180032F19B /* AITwitterStatusFollowup.h */,
1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */,
@@ -5041,15 +5052,11 @@
110966190F61D3E70064CA0E /* AITwitterReplyWindowController.m */,
11F739000F58D1C300B3285B /* AITwitterAccountViewController.h */,
11F739010F58D1C400B3285B /* AITwitterAccountViewController.m */,
- 11879C090F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.h */,
11D135D80FBE4C65000B0A5E /* AITwitterAccountView.xib */,
- 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */,
11BD73D10F5A54BB007D438A /* twitter-small.png */,
11BD73D20F5A54BB007D438A /* twitter.png */,
EFB1C3120DDBDA3100B3973D /* AITwitterIMPlugin.h */,
EFB1C3130DDBDA3100B3973D /* AITwitterIMPlugin.m */,
- 113F269E0F5CC03F00954772 /* AITwitterURLParser.h */,
- 113F269F0F5CC03F00954772 /* AITwitterURLParser.m */,
112523170F5F7F86003FC58A /* AITwitterURLHandler.h */,
112523180F5F7F86003FC58A /* AITwitterURLHandler.m */,
11F738FA0F58D19B00B3285B /* AITwitterPlugin.h */,
@@ -5064,36 +5071,6 @@
name = Twitter;
sourceTree = "<group>";
};
- 11F739590F58D4DC00B3285B /* MGTwitterEngine */ = {
- isa = PBXGroup;
- children = (
- 11F7395A0F58D4DC00B3285B /* MGTwitterEngine.h */,
- 11F7395B0F58D4DC00B3285B /* MGTwitterEngine.m */,
- 11F7395C0F58D4DC00B3285B /* MGTwitterEngineDelegate.h */,
- 11F7395D0F58D4DC00B3285B /* MGTwitterEngineGlobalHeader.h */,
- 11F7395E0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.h */,
- 11F7395F0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m */,
- 11F739640F58D4DC00B3285B /* MGTwitterMessagesParser.h */,
- 11F739650F58D4DC00B3285B /* MGTwitterMessagesParser.m */,
- 11F739680F58D4DC00B3285B /* MGTwitterMiscParser.h */,
- 11F739690F58D4DC00B3285B /* MGTwitterMiscParser.m */,
- 11F7396A0F58D4DC00B3285B /* MGTwitterParserDelegate.h */,
- 11F7396B0F58D4DC00B3285B /* MGTwitterRequestTypes.h */,
- 11F7396E0F58D4DC00B3285B /* MGTwitterStatusesParser.h */,
- 11F7396F0F58D4DC00B3285B /* MGTwitterStatusesParser.m */,
- 11F739720F58D4DC00B3285B /* MGTwitterUsersParser.h */,
- 11F739730F58D4DC00B3285B /* MGTwitterUsersParser.m */,
- 11F739740F58D4DC00B3285B /* MGTwitterXMLParser.h */,
- 11F739750F58D4DC00B3285B /* MGTwitterXMLParser.m */,
- 11F739760F58D4DC00B3285B /* NSData+Base64.h */,
- 11F739770F58D4DC00B3285B /* NSData+Base64.m */,
- 11F739780F58D4DC00B3285B /* NSString+UUID.h */,
- 11F739790F58D4DC00B3285B /* NSString+UUID.m */,
- );
- name = MGTwitterEngine;
- path = "Plugins/Twitter Plugin/MGTwitterEngine";
- sourceTree = "<group>";
- };
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
@@ -5104,6 +5081,7 @@
312ED3CA0C7E875B00A6BDA9 /* Unit tests.octest */,
6334FBFC0F9C11DC003C77A9 /* AIUtilities.framework */,
633D4FA40F9D3073004F491E /* AdiumSpotlightImporter.mdimporter */,
+ 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */,
);
name = Products;
sourceTree = "<group>";
@@ -5127,6 +5105,8 @@
312ED3D80C7E89CC00A6BDA9 /* Unit tests */,
29B97323FDCFA39411CA2CEA /* Linked Frameworks */,
63C7E0280FAF9B7D00B310AC /* xcconfigs */,
+ 761CE33E16F9087C000EE361 /* Dock Tile */,
+ 761CE33716F9087C000EE361 /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
name = CocAIMe2;
@@ -7352,6 +7332,34 @@
name = Growl;
sourceTree = "<group>";
};
+ 5A3B4D6A16D878AB00903E40 /* STTwitter */ = {
+ isa = PBXGroup;
+ children = (
+ 5A4B77E716FBDDC600DF398C /* NSData+Base64.m */,
+ 5A4B77E816FBDDC700DF398C /* NSData+Base64.h */,
+ 5A0D236816F4C7BC005DF211 /* STTwitterAppOnly.m */,
+ 5A0D236916F4C7BC005DF211 /* STTwitterAppOnly.h */,
+ 5A3B4D6B16D878AB00903E40 /* NSString+STTwitter.h */,
+ 5A3B4D6C16D878AB00903E40 /* NSString+STTwitter.m */,
+ 5A3B4D6D16D878AB00903E40 /* STTwitterAPIWrapper.h */,
+ 5A3B4D6E16D878AB00903E40 /* STTwitterAPIWrapper.m */,
+ 5A3B4D7116D878AB00903E40 /* STTwitterOAuth.h */,
+ 5A3B4D7216D878AB00903E40 /* STTwitterOAuth.m */,
+ 5A3B4D7516D878AB00903E40 /* STTwitterOAuthProtocol.h */,
+ 5A3B4D7616D878AC00903E40 /* Vendor */,
+ );
+ name = STTwitter;
+ sourceTree = "<group>";
+ };
+ 5A3B4D7616D878AC00903E40 /* Vendor */ = {
+ isa = PBXGroup;
+ children = (
+ 5A3B4D7716D878AC00903E40 /* STHTTPRequest.h */,
+ 5A3B4D7816D878AC00903E40 /* STHTTPRequest.m */,
+ );
+ name = Vendor;
+ sourceTree = "<group>";
+ };
5A8A6A46124456B1004965A8 /* Segmented control with menu popup */ = {
isa = PBXGroup;
children = (
@@ -8102,6 +8110,7 @@
63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */,
63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */,
63C7E11A0FAFA35E00B310AC /* AdiumApplescriptRunner.xcconfig */,
+ 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */,
);
path = xcconfigs;
sourceTree = "<group>";
@@ -8160,10 +8169,57 @@
name = "HTTP Server";
sourceTree = "<group>";
};
+ 761CE33716F9087C000EE361 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE33816F9087C000EE361 /* Cocoa.framework */,
+ 761CE33A16F9087C000EE361 /* Other Frameworks */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+ 761CE33A16F9087C000EE361 /* Other Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE33B16F9087C000EE361 /* AppKit.framework */,
+ 761CE33C16F9087C000EE361 /* CoreData.framework */,
+ 761CE33D16F9087C000EE361 /* Foundation.framework */,
+ );
+ name = "Other Frameworks";
+ sourceTree = "<group>";
+ };
+ 761CE33E16F9087C000EE361 /* Dock Tile */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE35116F909C1000EE361 /* Source */,
+ 761CE33F16F9087D000EE361 /* Supporting Files */,
+ );
+ name = "Dock Tile";
+ path = "Other/Adium Dock Tile Plugin";
+ sourceTree = SOURCE_ROOT;
+ };
+ 761CE33F16F9087D000EE361 /* Supporting Files */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE34016F9087D000EE361 /* AIDockTilePlugin-Info.plist */,
+ 761CE34416F9087D000EE361 /* AIDockTilePlugin-Prefix.pch */,
+ );
+ name = "Supporting Files";
+ sourceTree = "<group>";
+ };
+ 761CE35116F909C1000EE361 /* Source */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE35216F90A03000EE361 /* AIDockTile.h */,
+ 761CE35316F90A03000EE361 /* AIDockTile.m */,
+ );
+ name = Source;
+ sourceTree = "<group>";
+ };
76FF925C14B60B4B0043E23B /* Console */ = {
isa = PBXGroup;
children = (
- 76FF926314B62A980043E23B /* AIConsole.nib */,
+ 76FF926314B62A980043E23B /* AIConsole.xib */,
76FF926514B62AB80043E23B /* AIConsoleController.h */,
76FF926614B62AB80043E23B /* AIConsoleController.m */,
);
@@ -8234,7 +8290,6 @@
3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */,
9719C92B1530EDF700217FBE /* FriBidi.framework */,
7E9A8CB2104DEBC400F210CC /* Growl.framework */,
- 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */,
377EC8930AE9525B00CB7BDF /* PSMTabBarControl.framework */,
9719C92D1530EE0C00217FBE /* ShortcutRecorder.framework */,
9E1E1DFC0A96741500E16DFC /* LMX.framework */,
@@ -9296,6 +9351,7 @@
34BD9D24053146CC000AB133 /* Resources */,
34BD9D57053146CC000AB133 /* Frameworks */,
F51BCD3E0A156281000FDC06 /* Copy Spotlight Importer */,
+ 761CE34D16F90938000EE361 /* CopyFiles */,
34BD9D5F053146CC000AB133 /* Copy Frameworks */,
4BF2E91F067CB76300743318 /* Copy Built-in Xtras */,
34BD9D6A053146CC000AB133 /* Copy AdiumPlugins */,
@@ -9305,6 +9361,7 @@
81F9D1DF0A7F81A5004A35BD /* PBXBuildRule */,
);
dependencies = (
+ 761CE35016F9098E000EE361 /* PBXTargetDependency */,
11F6CB2E109BC6AC0070022D /* PBXTargetDependency */,
639DF9E30F97E687003C9A32 /* PBXTargetDependency */,
349C31630867D199000BF883 /* PBXTargetDependency */,
@@ -9375,6 +9432,23 @@
productReference = 633D4FA40F9D3073004F491E /* AdiumSpotlightImporter.mdimporter */;
productType = "com.apple.product-type.bundle";
};
+ 761CE33516F9087C000EE361 /* AIDockTilePlugin */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 761CE34B16F9087D000EE361 /* Build configuration list for PBXNativeTarget "AIDockTilePlugin" */;
+ buildPhases = (
+ 761CE33216F9087C000EE361 /* Sources */,
+ 761CE33316F9087C000EE361 /* Frameworks */,
+ 761CE33416F9087C000EE361 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = AIDockTilePlugin;
+ productName = AIDockTilePlugin;
+ productReference = 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */;
+ productType = "com.apple.product-type.bundle";
+ };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -9383,7 +9457,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AI;
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "The Adium Team";
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
@@ -9449,6 +9523,7 @@
34F3B9510BDF15F40011AB34 /* Touch Framework Bundles to Executable Date */,
312ED3C90C7E875B00A6BDA9 /* Unit tests */,
633D4FA30F9D3073004F491E /* Spotlight Importer */,
+ 761CE33516F9087C000EE361 /* AIDockTilePlugin */,
);
};
/* End PBXProject section */
@@ -9890,7 +9965,7 @@
1199AB0710BE13E600646322 /* Deny.tiff in Resources */,
1199AB0810BE13E600646322 /* Ignore.tiff in Resources */,
C699374B15F75FB2007EFFA0 /* stackImage at 2x.png in Resources */,
- 76FF926414B62A980043E23B /* AIConsole.nib in Resources */,
+ 76FF926414B62A980043E23B /* AIConsole.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9912,6 +9987,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE33416F9087C000EE361 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@@ -10453,24 +10535,9 @@
11F738F90F58D18700B3285B /* AITwitterService.m in Sources */,
11F738FC0F58D19B00B3285B /* AITwitterPlugin.m in Sources */,
11F739020F58D1C400B3285B /* AITwitterAccountViewController.m in Sources */,
- 11F7397A0F58D4DC00B3285B /* MGTwitterEngine.m in Sources */,
- 11F7397B0F58D4DC00B3285B /* MGTwitterHTTPURLConnection.m in Sources */,
- 11F7397E0F58D4DD00B3285B /* MGTwitterMessagesParser.m in Sources */,
- 11F739800F58D4DD00B3285B /* MGTwitterMiscParser.m in Sources */,
- 11F739820F58D4DD00B3285B /* MGTwitterStatusesParser.m in Sources */,
- 11F739840F58D4DD00B3285B /* MGTwitterUsersParser.m in Sources */,
- 11F739850F58D4DD00B3285B /* MGTwitterXMLParser.m in Sources */,
- 11F739860F58D4DD00B3285B /* NSData+Base64.m in Sources */,
- 11F739870F58D4DD00B3285B /* NSString+UUID.m in Sources */,
- 113F26A00F5CC03F00954772 /* AITwitterURLParser.m in Sources */,
112523190F5F7F86003FC58A /* AITwitterURLHandler.m in Sources */,
1109661A0F61D3E70064CA0E /* AITwitterReplyWindowController.m in Sources */,
- 113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */,
- 1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */,
- 1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */,
- 113891950F6B6B9C00A7D7DC /* AILaconicaAccountViewController.m in Sources */,
1163F0EC0F6C7A8300F12F5D /* AIURLShortenerPlugin.m in Sources */,
- 11879C0B0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m in Sources */,
11700A350F7E8BE80078D6AB /* AISpecialPasswordPromptController.m in Sources */,
112B490A0F82FB1700690E84 /* AIGroupChatStatusTooltipPlugin.m in Sources */,
112B4A250F83194700690E84 /* AIMentionAdvancedPreferences.m in Sources */,
@@ -10512,6 +10579,12 @@
761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */,
5A44595E169143130078AB0A /* AIPreferenceCVPrototypeView.m in Sources */,
76B8B8EC16AF3A46009126FE /* AIOTRTopBarLoggingWarningController.m in Sources */,
+ 5A3B4D7916D878AC00903E40 /* NSString+STTwitter.m in Sources */,
+ 5A3B4D7A16D878AC00903E40 /* STTwitterAPIWrapper.m in Sources */,
+ 5A3B4D7C16D878AC00903E40 /* STTwitterOAuth.m in Sources */,
+ 5A3B4D7E16D878AC00903E40 /* STHTTPRequest.m in Sources */,
+ 5A0D236A16F4C7BC005DF211 /* STTwitterAppOnly.m in Sources */,
+ 5A4B77E916FBDDC700DF398C /* NSData+Base64.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10734,6 +10807,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE33216F9087C000EE361 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 761CE35416F90A03000EE361 /* AIDockTile.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -10797,6 +10878,11 @@
target = F53C25AE0A2F95F100F7B73D /* Setup Build Directory */;
targetProxy = 63DE4C520F9C77D50034ED3A /* PBXContainerItemProxy */;
};
+ 761CE35016F9098E000EE361 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 761CE33516F9087C000EE361 /* AIDockTilePlugin */;
+ targetProxy = 761CE34F16F9098E000EE361 /* PBXContainerItemProxy */;
+ };
F5B17CDF0A16C767004AE99E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F5B17CCF0A16C6AC004AE99E /* Plist Macros */;
@@ -12281,7 +12367,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12289,7 +12374,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12297,7 +12381,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12305,11 +12388,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Frameworks\"",
- );
};
name = Debug;
};
@@ -12317,11 +12395,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Frameworks\"",
- );
};
name = Release;
};
@@ -12329,11 +12402,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Frameworks\"",
- );
};
name = "Release-Debug";
};
@@ -12362,7 +12430,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12370,7 +12437,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12378,7 +12444,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12386,7 +12451,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12394,7 +12458,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12402,7 +12465,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12410,7 +12472,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12418,7 +12479,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12426,7 +12486,27 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
+ };
+ name = "Release-Debug";
+ };
+ 761CE34516F9087D000EE361 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ 761CE34616F9087D000EE361 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ 761CE34716F9087D000EE361 /* Release-Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */;
+ buildSettings = {
};
name = "Release-Debug";
};
@@ -12434,7 +12514,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12442,7 +12521,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12450,7 +12528,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12458,13 +12535,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Frameworks\"",
- "\"$(SRCROOT)/build/Debug\"",
- );
- MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = Debug;
};
@@ -12472,14 +12542,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Frameworks\"",
- "\"$(SRCROOT)/build/Debug\"",
- );
- GCC_PREPROCESSOR_DEFINITIONS = RELEASE_BUILD;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = Release;
};
@@ -12487,17 +12549,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/Frameworks\"",
- "\"$(SRCROOT)/build/Debug\"",
- );
- GCC_PREPROCESSOR_DEFINITIONS = (
- RELEASE_BUILD,
- DEBUG_BUILD,
- );
- MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = "Release-Debug";
};
@@ -12526,8 +12577,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- PRODUCT_NAME = "Setup Build Directory";
};
name = Debug;
};
@@ -12535,8 +12584,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- PRODUCT_NAME = "Setup Build Directory";
};
name = Release;
};
@@ -12544,8 +12591,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
- PRODUCT_NAME = "Setup Build Directory";
};
name = "Release-Debug";
};
@@ -12553,7 +12598,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12561,7 +12605,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12569,7 +12612,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12636,6 +12678,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ 761CE34B16F9087D000EE361 /* Build configuration list for PBXNativeTarget "AIDockTilePlugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 761CE34516F9087D000EE361 /* Debug */,
+ 761CE34616F9087D000EE361 /* Release */,
+ 761CE34716F9087D000EE361 /* Release-Debug */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
DADE8DFF085507450062B664 /* Build configuration list for PBXNativeTarget "Adium.Framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff -r dd73ec06e6d6 -r c700a188cfbb AdiumHelp/pgs/Accounts-Sametime.html
--- a/AdiumHelp/pgs/Accounts-Sametime.html Wed Jan 23 13:08:47 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-Sametime.html Wed Apr 17 20:24:54 2013 +0200
@@ -46,7 +46,8 @@
</table>
<p>IBM Lotus Sametime is a messaging protocol used primarily in corporate environments.
<p>Adium's Sametime support is provided via the <a class="ext_link" href="http://meanwhile.sf.net/">Meanwhile</a> library and Pidgin plugin, an open re-implementation of the protocol developed by Christopher (siege) O'Brien. Sametime-specific issues and requests are best directed to the appropriate <a class="ext_link" href="http://sf.net/tracker/?group_id=110565</a>">Meanwhile project trackers</a>. Questions regarding the Meanwhile library and Pidgin plugin may be answered on the <a class="ext_link" href="http://meanwhile.sourceforge.net/faq/">Meanwhile FAQ</a> page.
- <p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your IT department to enable access for the Meanwhile client ID. Alternately, in Adium 1.0 or later, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
+ <p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your IT department to enable access for the Meanwhile client ID. Alternately, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
+ <p><a class="ext_link" href="http://www.nomaen.com/2012/01/connecting-with-ibmers-via-sametime-in.html">This blog post</a> has instructions on how to setup Sametime as an IBM employee.</p>
</div>
</div>
<div class="taskboxline">
diff -r dd73ec06e6d6 -r c700a188cfbb AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html
--- a/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Wed Jan 23 13:08:47 2013 +0100
+++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Wed Apr 17 20:24:54 2013 +0200
@@ -38,7 +38,7 @@
<p><strong>What about the Skype API?</strong></p>
<p>Using the Skype API, as the Skype Plugin does, means that Skype must be running. We don't accept piggybacking on the official client as a substitute.</p>
<p><strong>What about SkypeKit?</strong></p>
- <p>The SkypeKit SDK is not licensed to be used in any open-source software, such as Adium and so needs to be rewritten. <a class="ext_link" href="http://adiumxtras.com/index.php?a=xtras&xtra_id=5011">SkypeKit</a> also needs a skypekit-client program to be running in the background, so it puts us in the same boat as using the Skype API.</p>
+ <p>The SkypeKit SDK is not licensed to be used in any open-source software, such as Adium and so needs to be rewritten. SkypeKit also needs a skypekit-client program to be running in the background, so it puts us in the same boat as using the Skype API.</p>
</div>
</div>
</div>
diff -r dd73ec06e6d6 -r c700a188cfbb ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Wed Jan 23 13:08:47 2013 +0100
+++ b/ChangeLogs/Changes.txt Wed Apr 17 20:24:54 2013 +0200
@@ -3,33 +3,77 @@
Version 1.6 (X/X/X)
Major changes
* New preferences layout
- * Added high-resolution resources for "Retina Display" support
+ * "Retina Display" support
* Updated to libpurple x.y.z.
* Added SASL authentication support. (#14478)
+ Accessibility
+ * Fixed tabs not being spoken by VoiceOver. (#16088)
+
+ Chat window
+ * Fixed an issue that occurred when dragging a conversation window into an existing tabbed conversation window. (#16281)
+ * Made the Shift-Return keyboard shortcut add a newline the way Alt-Return does. (Detmud) (#16285)
+
+ Contact list
+ * Fixed an issue with contact list positioning. (#11278)
+ * Fixed an issue with contact list animation during search. (#16018)
+
+ "Retina Display" support
+ * Added high-resolution assets. (#15931, ##16067)
+ * Fixed high-resolution assets not being scaled correctly in context menus. (#16143)
+ * Added for support for high-resolution emoticons in the Message View. (Detmud) (#16221)
+ * Fixed visual glitches on bottom tabs. (#16074)
+ * Fixed visual glitches affecting the Transcript Viewer search bar. (#16053)
+
Plugins
* Added support for adding image upload services. (#15865) (Félix Cloutier)
Preferences
* Changed preferences layout to resemble OS X's System Preferences.
* Moved a bunch of preferences around for more consistency dissolving the "Advanced" preference pane and its sub-sections.
- * Made Privacy Settings a preference pane.
+ * Made Privacy Settings a preference pane. (#8307)
* Made the Xtras Manager a preference pane.
- * Renamed "Personal" preference pane to "Profile". (#16105) (Paul Wilde)
+ * Renamed the "Personal" preference pane to "Profile". (#16105) (Paul Wilde)
* Contact list: Added a preference for maximum contact list height. (#4815)
* General: Removed "Send Messages with:" option. (#15369)
* Accounts: Added a signup or about button to each account setup pane. (#3792) (Ariel Chinn)
+ * Encryption: Made text selectable in the "Show Fingerprint..." window. (#15082)
Transcript Viewer
* Added full screen support. (##16120) (Paul Wilde)
+----
+
* Changed the behaviour of the contact list menu item in the dock to always bring it to the front instead of toggling its visibility. (#4848) (Aaron Dodson)
- * Changed hotkey behaviour to hide Adium when pressed while Adium is active. (#4859) (Rafael Glauber)
+ * Changed hotkey behaviour to hide Adium when pressed while Adium is active. (#4859) (Rafael Glauber)
-(#13824) (#14081) (#15161) (#13330) (#14079)
+- "Adium changes Download Folder to ~/Desktop on its own if configured folder is missing" (#13824)
+- "Text Clip Support" (#14081)
+- "Allow /me action to be logged the way it is passed to the message view" (#13330)
+- "if an action ends in a colon, the colon will be emotified" (#14079)
+- "Improve "New Chat..." dialogue" (#14285)
+- Sandboxed message styles. (#15324)
+- Fixed DNS leaks in libpurple. / Added a "Tor (SOCKS5)" proxy option, which uses the Tor proxy option of libpurple. (#15161)
+- "Proxy bypass when registered jabber handle" (#15957)
-Version 1.5.4 (11/4/2012)
+Version 1.5.7 (XX/XX/20XX)
+ * Fix a bug that could cause SSL connections to be closed prematurely. (#16356)
+
+Version 1.5.6 (3/18/2013)
+ * Fix a crash on startup on 10.6.8.
+ * Fix a crash when accepting or canceling the certificate verification dialog. (#16280)
+ * Fix a crash or hang when trying to use OTR on 32-bits Macs. (#16203)
+
+Version 1.5.5 (2/24/2013)
+ * Updated libpurple to 2.10.7 fixing two security vulnerabilities.
+ * Fixed "Add Link..." when the cursor is at the end of the line. (#16200)
+ * Made sure the "Open Link" menu item in the chat window's context menu gets removed for other translations than English as well. Clicking the menu item wouldn't open the link in your default browser but in the chat window itself. (#16101)
+ * Fixed reference to an image. (Detmud) (#16301)
+ * Updated Spanish translation. (#16291)
+
+
+Version 1.5.4 (11/7/2012)
* 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)
* Updated libpurple to 2.10.6.
diff -r dd73ec06e6d6 -r c700a188cfbb Copyright.txt
More information about the commits
mailing list