adium 3926:ff50ddfe7fb2: Nuke QQ everywhere in Adium too.

commits at adium.im commits at adium.im
Tue Jun 7 17:04:41 UTC 2011


details:	http://hg.adium.im/adium/rev/ff50ddfe7fb2
revision:	3926:ff50ddfe7fb2
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue Jun 07 19:04:16 2011 +0200

Nuke QQ everywhere in Adium too.

diffs (truncated from 2707 to 1000 lines):

diff -r c37aecd53dc5 -r ff50ddfe7fb2 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Tue Jun 07 12:55:48 2011 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Tue Jun 07 19:04:16 2011 +0200
@@ -281,12 +281,6 @@
 		3419E2DF0A81445800C3FC68 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3419E2DE0A81445800C3FC68 /* Localizable.strings */; };
 		3419E2F80A8145B800C3FC68 /* GBFireImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = F50A75A10A0AE77A00A6D1BA /* GBFireImporter.m */; };
 		3419E2FA0A8145B900C3FC68 /* GBFireLogImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = F56E068D0A4B738B008D1EB5 /* GBFireLogImporter.m */; };
-		3419E7390A880AD400C3FC68 /* ESPurpleQQAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 3419E7370A880AD300C3FC68 /* ESPurpleQQAccount.h */; };
-		3419E73A0A880AD400C3FC68 /* ESPurpleQQAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 3419E7380A880AD400C3FC68 /* ESPurpleQQAccount.m */; };
-		3419E73F0A880B2C00C3FC68 /* ESQQService.h in Headers */ = {isa = PBXBuildFile; fileRef = 3419E73D0A880B2B00C3FC68 /* ESQQService.h */; };
-		3419E7400A880B2C00C3FC68 /* ESQQService.m in Sources */ = {isa = PBXBuildFile; fileRef = 3419E73E0A880B2C00C3FC68 /* ESQQService.m */; };
-		3419E7690A880CDA00C3FC68 /* ESPurpleQQAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3419E7670A880CD900C3FC68 /* ESPurpleQQAccountViewController.h */; };
-		3419E76A0A880CDA00C3FC68 /* ESPurpleQQAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3419E7680A880CD900C3FC68 /* ESPurpleQQAccountViewController.m */; };
 		3419F7760531512200C68BA3 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
 		3419FE230531586A00C68BA3 /* Adium.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
 		341BCF850961354D00CF83F5 /* AIMessageWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 341BCF810961354D00CF83F5 /* AIMessageWindow.m */; };
@@ -358,7 +352,6 @@
 		344D974F0C3C442600498CA1 /* InstantMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97410C3C442500498CA1 /* InstantMessage.m */; };
 		344D97510C3C442600498CA1 /* Person.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97430C3C442500498CA1 /* Person.m */; };
 		344D97530C3C442600498CA1 /* Presentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 344D97450C3C442600498CA1 /* Presentity.m */; };
-		34500ED00A881F8500509225 /* PurpleDefaultsQQ.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3419E74B0A880C0900C3FC68 /* PurpleDefaultsQQ.plist */; };
 		3456231C0A3771D800E7FC97 /* ESRankingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456231A0A3771D800E7FC97 /* ESRankingCell.m */; };
 		345623200A3771E100E7FC97 /* AIChatLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 3456231E0A3771E100E7FC97 /* AIChatLog.m */; };
 		3456232A0A3771F400E7FC97 /* AILogToGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 345623240A3771F300E7FC97 /* AILogToGroup.m */; };
@@ -1033,7 +1026,6 @@
 		34F4677A080F49C5007800AB /* Safari.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 34F46778080F49C5007800AB /* Safari.scpt */; };
 		34F4677B080F49C5007800AB /* Safari.png in Resources */ = {isa = PBXBuildFile; fileRef = 34F46779080F49C5007800AB /* Safari.png */; };
 		34F46785080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F46783080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m */; };
-		34F5207E0CC6F821008D9135 /* PurpleQQAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F5207D0CC6F821008D9135 /* PurpleQQAccountView.nib */; };
 		34F849530A4AEFA00002A017 /* LogFileUpgrade.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34F849520A4AEFA00002A017 /* LogFileUpgrade.nib */; };
 		34F849590A4AF04D0002A017 /* AILogFileUpgradeWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F849570A4AF04D0002A017 /* AILogFileUpgradeWindowController.m */; };
 		34F8D2AE0CF68FEB00F62536 /* AIUserListOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F8D2AD0CF68FEB00F62536 /* AIUserListOutlineView.m */; };
@@ -2218,13 +2210,6 @@
 		3419E2F40A81452400C3FC68 /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path = "Frameworks/Adium Framework/Resources/zh_TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3419E5960A86996200C3FC68 /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = Resources/tr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3419E5970A86996300C3FC68 /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = "Plugins/Purple Service/tr.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3419E7370A880AD300C3FC68 /* ESPurpleQQAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPurpleQQAccount.h; path = "Plugins/Purple Service/ESPurpleQQAccount.h"; sourceTree = "<group>"; };
-		3419E7380A880AD400C3FC68 /* ESPurpleQQAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPurpleQQAccount.m; path = "Plugins/Purple Service/ESPurpleQQAccount.m"; sourceTree = "<group>"; };
-		3419E73D0A880B2B00C3FC68 /* ESQQService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESQQService.h; path = "Plugins/Purple Service/ESQQService.h"; sourceTree = "<group>"; };
-		3419E73E0A880B2C00C3FC68 /* ESQQService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESQQService.m; path = "Plugins/Purple Service/ESQQService.m"; sourceTree = "<group>"; };
-		3419E74B0A880C0900C3FC68 /* PurpleDefaultsQQ.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = PurpleDefaultsQQ.plist; path = "Plugins/Purple Service/PurpleDefaultsQQ.plist"; sourceTree = "<group>"; };
-		3419E7670A880CD900C3FC68 /* ESPurpleQQAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPurpleQQAccountViewController.h; path = "Plugins/Purple Service/ESPurpleQQAccountViewController.h"; sourceTree = "<group>"; };
-		3419E7680A880CD900C3FC68 /* ESPurpleQQAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPurpleQQAccountViewController.m; path = "Plugins/Purple Service/ESPurpleQQAccountViewController.m"; sourceTree = "<group>"; };
 		341BCF800961354D00CF83F5 /* AIMessageWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIMessageWindow.h; path = Source/AIMessageWindow.h; sourceTree = "<group>"; };
 		341BCF810961354D00CF83F5 /* AIMessageWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIMessageWindow.m; path = Source/AIMessageWindow.m; sourceTree = "<group>"; };
 		341BCF820961354D00CF83F5 /* AIClickThroughThemeDocumentButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIClickThroughThemeDocumentButton.h; path = Source/AIClickThroughThemeDocumentButton.h; sourceTree = "<group>"; };
@@ -3061,7 +3046,7 @@
 		346C9C200E70E1F8002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = "Plugins/WebKit Message View/hu.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
 		346CFDC4087B7836009711C8 /* AdiumIdleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdiumIdleManager.h; path = Source/AdiumIdleManager.h; sourceTree = "<group>"; };
 		346CFDC5087B7836009711C8 /* AdiumIdleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AdiumIdleManager.m; path = Source/AdiumIdleManager.m; sourceTree = "<group>"; };
-		346F5CB308A418FB0055C610 /* CurrentTunes.scpt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = file; name = CurrentTunes.scpt; path = Resources/CurrentTunes.scpt; sourceTree = "<group>"; };
+		346F5CB308A418FB0055C610 /* CurrentTunes.scpt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.scpt; name = CurrentTunes.scpt; path = Resources/CurrentTunes.scpt; sourceTree = "<group>"; };
 		347065E406015DC5004F0D20 /* WebKit Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = "WebKit Defaults.plist"; path = "Plugins/WebKit Message View/WebKit Defaults.plist"; sourceTree = "<group>"; };
 		347374BC0AA9206B00AD18E3 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
 		347374F00AA920F300AD18E3 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = Resources/ca.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3846,7 +3831,7 @@
 		34F4675B080F46AC007800AB /* ESBonjourAccountView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = ESBonjourAccountView.nib; sourceTree = "<group>"; };
 		34F4675C080F46AC007800AB /* AWBonjourService.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AWBonjourService.m; sourceTree = "<group>"; };
 		34F4675D080F46AC007800AB /* AWBonjourService.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AWBonjourService.h; sourceTree = "<group>"; };
-		34F46778080F49C5007800AB /* Safari.scpt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = file; name = Safari.scpt; path = Resources/Safari.scpt; sourceTree = "<group>"; };
+		34F46778080F49C5007800AB /* Safari.scpt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.scpt; name = Safari.scpt; path = Resources/Safari.scpt; sourceTree = "<group>"; };
 		34F46779080F49C5007800AB /* Safari.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Safari.png; path = Resources/Safari.png; sourceTree = "<group>"; };
 		34F46783080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESSafariLinkToolbarItemPlugin.m; path = Source/ESSafariLinkToolbarItemPlugin.m; sourceTree = "<group>"; };
 		34F46784080F7FFB007800AB /* ESSafariLinkToolbarItemPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESSafariLinkToolbarItemPlugin.h; path = Source/ESSafariLinkToolbarItemPlugin.h; sourceTree = "<group>"; };
@@ -3864,7 +3849,6 @@
 		34F468EB080FA987007800AB /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = "Plugins/Purple Service/de.lproj/ESPurpleYahooAccountView.nib"; sourceTree = "<group>"; };
 		34F468EC080FA988007800AB /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = "Plugins/Purple Service/de.lproj/DCPurpleZephyrJoinChatView.nib"; sourceTree = "<group>"; };
 		34F468ED080FA988007800AB /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = "Plugins/Purple Service/de.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
-		34F5207D0CC6F821008D9135 /* PurpleQQAccountView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PurpleQQAccountView.nib; path = "Plugins/Purple Service/PurpleQQAccountView.nib"; sourceTree = "<group>"; };
 		34F52BCB06E2AFBC00887BE2 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/en.lproj/ESPurpleICQAccountView.nib"; sourceTree = "<group>"; };
 		34F52BCF06E2AFF700887BE2 /* ESPurpleICQAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPurpleICQAccountViewController.h; path = "Plugins/Purple Service/ESPurpleICQAccountViewController.h"; sourceTree = "<group>"; };
 		34F52BD006E2AFF700887BE2 /* ESPurpleICQAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPurpleICQAccountViewController.m; path = "Plugins/Purple Service/ESPurpleICQAccountViewController.m"; sourceTree = "<group>"; };
@@ -4507,12 +4491,12 @@
 		6360B2590BF2EB93004CD99B /* AIWebKitDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIWebKitDelegate.m; path = "Plugins/WebKit Message View/AIWebKitDelegate.m"; sourceTree = "<group>"; };
 		636C6E5D0ED56D0100E0E528 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
 		636D8C970E4E95A500E5F558 /* AIAddressBookController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAddressBookController.m; path = "Frameworks/Adium Framework/Source/AIAddressBookController.m"; sourceTree = "<group>"; };
-		636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = AdiumAddressBookAction_Yahoo.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt"; sourceTree = "<group>"; };
-		636D93670E4E9FD300E5F558 /* AdiumAddressBookAction_SMS.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = AdiumAddressBookAction_SMS.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt"; sourceTree = "<group>"; };
-		636D93680E4E9FD300E5F558 /* AdiumAddressBookAction_MSN.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = AdiumAddressBookAction_MSN.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt"; sourceTree = "<group>"; };
-		636D93690E4E9FD300E5F558 /* AdiumAddressBookAction_Jabber.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = AdiumAddressBookAction_Jabber.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt"; sourceTree = "<group>"; };
-		636D936A0E4E9FD300E5F558 /* AdiumAddressBookAction_ICQ.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = AdiumAddressBookAction_ICQ.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt"; sourceTree = "<group>"; };
-		636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = AdiumAddressBookAction_AIM.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt"; sourceTree = "<group>"; };
+		636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_Yahoo.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt"; sourceTree = "<group>"; };
+		636D93670E4E9FD300E5F558 /* AdiumAddressBookAction_SMS.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_SMS.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt"; sourceTree = "<group>"; };
+		636D93680E4E9FD300E5F558 /* AdiumAddressBookAction_MSN.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_MSN.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt"; sourceTree = "<group>"; };
+		636D93690E4E9FD300E5F558 /* AdiumAddressBookAction_Jabber.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_Jabber.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt"; sourceTree = "<group>"; };
+		636D936A0E4E9FD300E5F558 /* AdiumAddressBookAction_ICQ.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_ICQ.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt"; sourceTree = "<group>"; };
+		636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_AIM.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt"; sourceTree = "<group>"; };
 		638392F609D4D67A0067B9B7 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; };
 		638BC1FA0FC932E000CE7600 /* AIObjectDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIObjectDebug.h; path = Source/AIObjectDebug.h; sourceTree = "<group>"; };
 		638BC1FB0FC932E000CE7600 /* AIObjectDebug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIObjectDebug.m; path = Source/AIObjectDebug.m; sourceTree = "<group>"; };
@@ -5318,14 +5302,6 @@
 		3419E72D0A88086E00C3FC68 /* QQ */ = {
 			isa = PBXGroup;
 			children = (
-				3419E73D0A880B2B00C3FC68 /* ESQQService.h */,
-				3419E73E0A880B2C00C3FC68 /* ESQQService.m */,
-				3419E7370A880AD300C3FC68 /* ESPurpleQQAccount.h */,
-				3419E7380A880AD400C3FC68 /* ESPurpleQQAccount.m */,
-				34F5207D0CC6F821008D9135 /* PurpleQQAccountView.nib */,
-				3419E7670A880CD900C3FC68 /* ESPurpleQQAccountViewController.h */,
-				3419E7680A880CD900C3FC68 /* ESPurpleQQAccountViewController.m */,
-				3419E74B0A880C0900C3FC68 /* PurpleDefaultsQQ.plist */,
 			);
 			name = QQ;
 			sourceTree = "<group>";
@@ -9043,9 +9019,6 @@
 				34E036880A75AA4F00394F11 /* ESICQService.h in Headers */,
 				34E0368A0A75AA4F00394F11 /* ESPurpleICQAccount.h in Headers */,
 				34E0368C0A75AA4F00394F11 /* ESPurpleICQAccountViewController.h in Headers */,
-				3419E7390A880AD400C3FC68 /* ESPurpleQQAccount.h in Headers */,
-				3419E73F0A880B2C00C3FC68 /* ESQQService.h in Headers */,
-				3419E7690A880CDA00C3FC68 /* ESPurpleQQAccountViewController.h in Headers */,
 				343700A90A9C1E170028604E /* AIAdvancedPreferencePane.h in Headers */,
 				34D073CB0B1E1A4500D63DF2 /* ESPurpleDotMacAccountViewController.h in Headers */,
 				34D073CD0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.h in Headers */,
@@ -9484,7 +9457,6 @@
 			};
 			buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
@@ -9644,7 +9616,6 @@
 				34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.nib in Resources */,
 				34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.nib in Resources */,
 				34E0368F0A75AA4F00394F11 /* PurpleDefaultsICQ.plist in Resources */,
-				34500ED00A881F8500509225 /* PurpleDefaultsQQ.plist in Resources */,
 				347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */,
 				34D073D60B1E1A5000D63DF2 /* PurpleDefaultsMac.plist in Resources */,
 				34D073D70B1E1A5000D63DF2 /* PurpleDefaultsAIM.plist in Resources */,
@@ -9657,7 +9628,6 @@
 				343BB5C40C96D57900506F9B /* PurpleDefaultsMySpace.plist in Resources */,
 				343BB63B0C96DC1100506F9B /* MySpace-small.png in Resources */,
 				343BB63C0C96DC1100506F9B /* MySpace-large.png in Resources */,
-				34F5207E0CC6F821008D9135 /* PurpleQQAccountView.nib in Resources */,
 				34EF99AA0E2EB35A003E5DC7 /* PurpleDefaultsMobileMe.plist in Resources */,
 				34EF9A320E2EB637003E5DC7 /* MobileMe-large.png in Resources */,
 				34EF9A330E2EB637003E5DC7 /* MobileMe-small.png in Resources */,
@@ -10174,9 +10144,6 @@
 				34E036890A75AA4F00394F11 /* ESICQService.m in Sources */,
 				34E0368B0A75AA4F00394F11 /* ESPurpleICQAccount.m in Sources */,
 				34E0368D0A75AA4F00394F11 /* ESPurpleICQAccountViewController.m in Sources */,
-				3419E73A0A880AD400C3FC68 /* ESPurpleQQAccount.m in Sources */,
-				3419E7400A880B2C00C3FC68 /* ESQQService.m in Sources */,
-				3419E76A0A880CDA00C3FC68 /* ESPurpleQQAccountViewController.m in Sources */,
 				34D073CA0B1E1A4400D63DF2 /* ESPurpleDotMacAccountViewController.m in Sources */,
 				34D073CC0B1E1A4500D63DF2 /* ESPurpleDotMacAccount.m in Sources */,
 				34D073CE0B1E1A4500D63DF2 /* ESPurpleAIMAccount.m in Sources */,
diff -r c37aecd53dc5 -r ff50ddfe7fb2 AdiumHelp/pgs/Accounts-CreatingAccounts.html
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html	Tue Jun 07 12:55:48 2011 +0200
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html	Tue Jun 07 19:04:16 2011 +0200
@@ -73,7 +73,6 @@
 				<li>Non-English Free Services
 				<ul>
 					<li><a class="ext_link" href="http://www.gadu-gadu.pl/">Gadu-Gadu</a> - Polish</li>
-					<li><a class="ext_link" href="http://freeqq2.qq.com/1.shtml">QQ</a> - Chinese / South African</li>
 					<li><a class="ext_link" href="http://messenger.yahoo.co.jp/">Yahoo! Japan</a> - Japanese</li>
 				</ul>
 				</li>
diff -r c37aecd53dc5 -r ff50ddfe7fb2 AdiumHelp/pgs/Accounts-ListOfServices.html
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html	Tue Jun 07 12:55:48 2011 +0200
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html	Tue Jun 07 19:04:16 2011 +0200
@@ -49,7 +49,6 @@
 				<li><a href="Accounts-MySpace.html">MySpaceIM</a></li>
 				<li><a href="Accounts-Gadu-Gadu.html">Gadu-Gadu</a></li>
 				<li><a href="Accounts-Sametime.html">IBM Lotus Sametime</a></li>
-				<li><a href="Accounts-QQ.html">Tencent QQ</a></li>
 				<li><a href="Accounts-GroupWise.html">Novell GroupWise</a></li>
 			</ul>
 		</div>
diff -r c37aecd53dc5 -r ff50ddfe7fb2 AdiumHelp/pgs/Accounts-QQ.html
--- a/AdiumHelp/pgs/Accounts-QQ.html	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="Tencent QQ" />
-<meta name="description" content="Tencent QQ" />
-<title>Tencent QQ</title>
-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
-</head>
-<body>
-<div id="banner">
-	<div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
-	<div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
-	<div id="pagetitle">
-		<h1>Tencent QQ</h1>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Description</h3>
-		</div>
-		<div class="taskboxtext">
-			<table> 
-				<tr>
-					<td><strong>Homepage:</strong></td>
-					<td> <a class="ext_link" href="http://www.qq.com/">http://http://www.qq.com/</a> (China); <a class="ext_link" href="http://www.qq.co.za/">http://www.qq.co.za/</a> (South Africa)</td>
-				</tr>
-				<tr>
-					<td><strong>Type:</strong></td>
-					<td>Proprietary</td>
-				</tr>
-				<tr>
-					<td><strong>Identity:</strong></td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><strong>Interoperability:</strong></td>
-					<td></td>
-				</tr>
-				<tr>
-					<td><strong>Popularity:</strong></td>
-					<td>China; South Africa</td>
-				</tr>
-			</table>
-			<p>Tencent QQ is the most popular free instant messaging computer program in Mainland China. Curiously, it it also very common in South Africa.</p>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>History</h3>
-		</div>
-		<div class="taskboxtext">
-			<p></p>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Censorship</h3>
-		</div>
-		<div class="taskboxtext">
-			<p></p>
-		</div>
-	</div>
-	</div>
-	</body>
-</html>
\ No newline at end of file
diff -r c37aecd53dc5 -r ff50ddfe7fb2 AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html	Tue Jun 07 12:55:48 2011 +0200
+++ b/AdiumHelp/pgs/AdiumDocumentation.html	Tue Jun 07 19:04:16 2011 +0200
@@ -177,7 +177,6 @@
 							<li><a href="Accounts-MySpace.html">MySpaceIM</a></li>
 							<li><a href="Accounts-Gadu-Gadu.html">Gadu-Gadu</a></li>
 							<li><a href="Accounts-Sametime.html">IBM Lotus Sametime</a></li>
-							<li><a href="Accounts-QQ.html">Tencent QQ</a></li>
 							<li><a href="Accounts-GroupWise.html">Novell GroupWise</a></li>
 					</ul></td>
 				</tr>
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/CBPurpleServicePlugin.m
--- a/Plugins/Purple Service/CBPurpleServicePlugin.m	Tue Jun 07 12:55:48 2011 +0200
+++ b/Plugins/Purple Service/CBPurpleServicePlugin.m	Tue Jun 07 19:04:16 2011 +0200
@@ -50,7 +50,10 @@
 	[AILiveJournalService registerService];
 	[ESMSNService registerService];
 	[PurpleMySpaceService registerService];
-	[ESQQService registerService];
+	/* TODO for release of 1.5: At the very least, present to users who had a QQ account
+	 * a message that it's no longer supported.
+	 */
+	//[ESQQService registerService];
 	[ESSimpleService registerService];
 	[ESNovellService registerService];
 	[ESJabberService registerService];
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/ESPurpleQQAccount.h
--- a/Plugins/Purple Service/ESPurpleQQAccount.h	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/* 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- * 
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#import "CBPurpleAccount.h"
-
-#define KEY_QQ_USE_TCP @"QQ:Use TCP"
-#define KEY_QQ_CLIENT_VERSION @"QQ:Client Version"
-
- at interface ESPurpleQQAccount : CBPurpleAccount {
-
-}
-
- at end
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/ESPurpleQQAccount.m
--- a/Plugins/Purple Service/ESPurpleQQAccount.m	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- * 
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#import "ESPurpleQQAccount.h"
-
-
- at implementation ESPurpleQQAccount
-
-- (const char*)protocolPlugin
-{
-    return "prpl-qq";
-}
-
-- (void)configurePurpleAccount
-{
-	[super configurePurpleAccount];
-	
-	purple_account_set_bool(account, "use_tcp", [[self preferenceForKey:KEY_QQ_USE_TCP group:GROUP_ACCOUNT_STATUS] boolValue]);
-	purple_account_set_string(account, "client_version", [[self preferenceForKey:KEY_QQ_CLIENT_VERSION group:GROUP_ACCOUNT_STATUS] UTF8String]);
-}
-
-/*!
- * @brief The server name to be passed to libpurple
- * QQ prpl will choose a server randomly for load balancing if we don't pass one, so do that.  -self.host returns the first server
- * for host reachability checking purpoes.
- */
-- (NSString *)hostForPurple
-{
-	NSString *specifiedHost = [self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS];
-	return (specifiedHost ? specifiedHost : nil);			
-}
-
-- (NSString *)host
-{
-/* This is not technically right, since the qq plugin randomly chooses one of many different servers at connect time.
- * "sz.tencent.com" or "sz#.tencent.com" for UDP
- * "tcpconn.tencent.com" or "tcpconn#.tencent.com" where (# <= 6) for TCP.
- * Specifying the host is important for network reachability checking, though, and generally all hosts should be up if one is reachable.
- */
-	NSString *host = [self hostForPurple];
-	if (!host)
-		host = ([[self preferenceForKey:KEY_QQ_USE_TCP group:GROUP_ACCOUNT_STATUS] boolValue] ? @"tcpconn.tencent.com" : @"sz.tencent.com");
-	
-	return host;
-}
-
-#pragma mark Account Action Menu Items
-- (NSString *)titleForAccountActionMenuLabel:(const char *)label
-{
-	if (label && (strcmp(label, _("Modify my information")) == 0)) {
-		return AILocalizedString(@"Modify My Information", "Menu title for configuring the public information for a QQ account");
-	}
-	
-	return [super titleForAccountActionMenuLabel:label];
-}
-
- at end
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/ESPurpleQQAccountViewController.h
--- a/Plugins/Purple Service/ESPurpleQQAccountViewController.h	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/* 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- * 
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#import "PurpleAccountViewController.h"
-
- at interface ESPurpleQQAccountViewController : PurpleAccountViewController {
-	IBOutlet	NSButton	*checkBox_useTCP;
-	IBOutlet	NSTextField *label_connection;
-	
-	IBOutlet	NSTextField		*label_clientVersion;
-	IBOutlet	NSPopUpButton	*popUp_clientVersion;
-}
-
- at end
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/ESPurpleQQAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleQQAccountViewController.m	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- * 
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#import "ESPurpleQQAccountViewController.h"
-#import "ESPurpleQQAccount.h"
-
-#import <AIUtilities/AIMenuAdditions.h>
-#import <AIUtilities/AIPopUpButtonAdditions.h>
-
- at interface ESPurpleQQAccountViewController()
-- (NSMenu *)clientVersionMenu;
- at end
-
- at implementation ESPurpleQQAccountViewController
-- (NSString *)nibName{
-    return @"PurpleQQAccountView";
-}
-
-/*!
- * @brief Awake from nib
- */
-- (void)awakeFromNib
-{
-	[super awakeFromNib];
-	[popUp_clientVersion setMenu:[self clientVersionMenu]];
-}
-
-
-//Configure controls
-- (void)configureForAccount:(AIAccount *)inAccount
-{
-    [super configureForAccount:inAccount];
-
-	[checkBox_useTCP setState:[[account preferenceForKey:KEY_QQ_USE_TCP 
-												   group:GROUP_ACCOUNT_STATUS] boolValue]];
-	[checkBox_useTCP setLocalizedString:AILocalizedString(@"Connect using TCP", nil)];
-
-	[label_connection setLocalizedString:AILocalizedString(@"Connection:", nil)];
-	
-	[label_clientVersion setLocalizedString:AILocalizedString(@"Client Version:", nil)];
-	
-	[popUp_clientVersion selectItemWithRepresentedObject:[inAccount preferenceForKey:KEY_QQ_CLIENT_VERSION
-																			   group:GROUP_ACCOUNT_STATUS]];
-}
-
-//Save controls
-- (void)saveConfiguration
-{
-	[account setPreference:[NSNumber numberWithBool:[checkBox_useTCP state]] 
-					forKey:KEY_QQ_USE_TCP group:GROUP_ACCOUNT_STATUS];
-	
-	[account setPreference:[[popUp_clientVersion selectedItem] representedObject]
-					forKey:KEY_QQ_CLIENT_VERSION
-					 group:GROUP_ACCOUNT_STATUS];
-
-	[super saveConfiguration];
-}
-
-- (NSMenu *)clientVersionMenu
-{
-	NSMenu			*clientVersionMenu = [[NSMenu allocWithZone:[NSMenu zone]] init];
-	NSDictionary	*clientVersionDict = [NSDictionary dictionaryWithObjectsAndKeys:
-										  @"2008", @"qq2008",
-										  @"2007", @"qq2007",
-										  @"2005", @"qq2005",
-										  nil];
-	
-	for (NSString *prefix in clientVersionDict.allKeys) {
-		[clientVersionMenu addItemWithTitle:[clientVersionDict objectForKey:prefix]
-									 target:nil
-									 action:nil
-							  keyEquivalent:@""
-						  representedObject:prefix];
-	}
-
-	return [clientVersionMenu autorelease];
-}
-
- at end
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/ESQQService.h
--- a/Plugins/Purple Service/ESQQService.h	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- * 
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#import "PurpleService.h"
-
- at interface ESQQService : PurpleService {
-
-}
-
- at end
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/ESQQService.m
--- a/Plugins/Purple Service/ESQQService.m	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* 
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- * 
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#import "ESQQService.h"
-#import "ESPurpleQQAccount.h"
-#import "ESPurpleQQAccountViewController.h"
-#import <Adium/AIStatusControllerProtocol.h>
-#import <AIUtilities/AICharacterSetAdditions.h>
-
- at implementation ESQQService
-//Account Creation
-- (Class)accountClass{
-	return [ESPurpleQQAccount class];
-}
-
-- (AIAccountViewController *)accountViewController{
-    return [ESPurpleQQAccountViewController accountViewController];
-}
-
-- (DCJoinChatViewController *)joinChatView{
-	return nil;
-}
-
-//Service Description
-- (NSString *)serviceCodeUniqueID{
-	return @"libpurple-qq";
-}
-- (NSString *)serviceID{
-	return @"QQ";
-}
-- (NSString *)serviceClass{
-	return @"QQ";
-}
-- (NSString *)shortDescription{
-	return @"QQ";
-}
-- (NSString *)longDescription{
-	return @"QQ";
-}
-- (NSCharacterSet *)allowedCharacters{
-	NSMutableCharacterSet	*allowedCharacters = [[NSCharacterSet alphanumericCharacterSet] mutableCopy];
-	NSCharacterSet			*returnSet;
-
-	[allowedCharacters addCharactersInString:@"-"];
-	returnSet = [allowedCharacters immutableCopy];
-	[allowedCharacters release];
-
-	return [returnSet autorelease];
-}
-- (NSUInteger)allowedLength{
-	return 255;
-}
-- (BOOL)caseSensitive{
-	return NO;
-}
-- (AIServiceImportance)serviceImportance{
-	return AIServiceSecondary;
-}
-- (BOOL)canCreateGroupChats{
-	return NO;
-}
-
-- (void)registerStatuses{
-	[adium.statusController registerStatus:STATUS_NAME_AVAILABLE
-							 withDescription:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_AVAILABLE]
-									  ofType:AIAvailableStatusType
-								  forService:self];
-	[adium.statusController registerStatus:STATUS_NAME_AWAY
-							 withDescription:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_AWAY]
-									  ofType:AIAwayStatusType
-								  forService:self];
-	[adium.statusController registerStatus:STATUS_NAME_INVISIBLE
-							 withDescription:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_INVISIBLE]
-									  ofType:AIInvisibleStatusType
-								  forService:self];
-	
-}
-
- at end
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/PurpleDefaultsQQ.plist
--- a/Plugins/Purple Service/PurpleDefaultsQQ.plist	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>QQ:Client Version</key>
-	<string>qq2008</string>
-	<key>QQ:Use TCP</key>
-	<false/>
-</dict>
-</plist>
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/PurpleQQAccountView.nib/classes.nib
--- a/Plugins/Purple Service/PurpleQQAccountView.nib/classes.nib	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-{
-    IBClasses =     (
-                {
-            ACTIONS =             {
-                changedPreference = id;
-            };
-            CLASS = AIAccountViewController;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "checkBox_checkMail" = NSButton;
-                "checkBox_sendTyping" = NSButton;
-                "label_alias" = NSTextField;
-                "label_encryption" = NSTextField;
-                "label_password" = NSTextField;
-                "label_port" = NSTextField;
-                "label_server" = NSTextField;
-                "label_typing" = NSTextField;
-                "popUp_encryption" = NSPopUpButton;
-                "progressIndicator_registering" = NSProgressIndicator;
-                "textField_accountUID" = NSTextField;
-                "textField_accountUIDLabel" = NSTextField;
-                "textField_alias" = NSTextField;
-                "textField_connectHost" = NSTextField;
-                "textField_connectPort" = NSTextField;
-                "textField_password" = NSTextField;
-                "textField_registering" = NSTextField;
-                "view_auxiliaryTabView" = NSTabView;
-                "view_options" = NSView;
-                "view_privacy" = NSView;
-                "view_profile" = NSView;
-                "view_setup" = NSView;
-            };
-            SUPERCLASS = AIObject;
-        },
-                {
-            CLASS = AILocalizationButton;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "view_anchorToLeftSide" = NSView;
-                "view_anchorToRightSide" = NSView;
-                "window_anchorOnLeftSide" = NSWindow;
-                "window_anchorOnRightSide" = NSWindow;
-            };
-            SUPERCLASS = NSButton;
-        },
-                {
-            CLASS = AILocalizationTextField;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "view_anchorToLeftSide" = NSView;
-                "view_anchorToRightSide" = NSView;
-                "window_anchorOnLeftSide" = NSWindow;
-                "window_anchorOnRightSide" = NSWindow;
-            };
-            SUPERCLASS = NSTextField;
-        },
-                {
-            CLASS = AIObject;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = ESPurpleQQAccountViewController;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "checkBox_useTCP" = NSButton;
-                "label_connection" = NSTextField;
-            };
-            SUPERCLASS = AIAccountViewController;
-        },
-                {
-            CLASS = FirstResponder;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSObject;
-        },
-                {
-            CLASS = NSButton;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSControl;
-        },
-                {
-            CLASS = NSTextField;
-            LANGUAGE = ObjC;
-            SUPERCLASS = NSControl;
-        }
-    );
-    IBVersion = 1;
-}
\ No newline at end of file
diff -r c37aecd53dc5 -r ff50ddfe7fb2 Plugins/Purple Service/PurpleQQAccountView.nib/designable.nib
--- a/Plugins/Purple Service/PurpleQQAccountView.nib/designable.nib	Tue Jun 07 12:55:48 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1847 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10B504</string>
-		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
-		<string key="IBDocument.HIToolboxVersion">437.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">740</string>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<integer value="29"/>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="721129253">
-			<object class="NSCustomObject" id="835319544">
-				<string key="NSClassName">ESPurpleQQAccountViewController</string>
-			</object>
-			<object class="NSCustomObject" id="390850984">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="437798010">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomView" id="423647183">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">258</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSPopUpButton" id="710582001">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{189, 6}, {139, 26}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="789435049">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">2048</int>
-							<object class="NSFont" key="NSSupport" id="604030241">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">13</double>
-								<int key="NSfFlags">1044</int>
-							</object>
-							<reference key="NSControlView" ref="710582001"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">129</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="555914003">
-								<reference key="NSMenu" ref="245371641"/>
-								<string key="NSTitle">Item 1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<object class="NSCustomResource" key="NSOnImage" id="206394907">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuCheckmark</string>
-								</object>
-								<object class="NSCustomResource" key="NSMixedImage" id="160108860">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuMixedState</string>
-								</object>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="789435049"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="245371641">
-								<string key="NSTitle">OtherViews</string>
-								<array class="NSMutableArray" key="NSMenuItems">
-									<reference ref="555914003"/>
-									<object class="NSMenuItem" id="49223022">
-										<reference key="NSMenu" ref="245371641"/>
-										<string key="NSTitle">Item 2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="206394907"/>
-										<reference key="NSMixedImage" ref="160108860"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="789435049"/>
-									</object>
-									<object class="NSMenuItem" id="683168651">
-										<reference key="NSMenu" ref="245371641"/>
-										<string key="NSTitle">Item 3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="206394907"/>
-										<reference key="NSMixedImage" ref="160108860"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="789435049"/>
-									</object>
-								</array>
-								<reference key="NSMenuFont" ref="604030241"/>
-							</object>
-							<int key="NSPreferredEdge">1</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">2</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="388872347">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{47, 13}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="648379178">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Client Version:</string>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="388872347"/>
-							<object class="NSColor" key="NSBackgroundColor" id="841104386">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="53173630">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlTextColor</string>
-								<object class="NSColor" key="NSColor" id="99333719">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSTextField" id="551740824">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{47, 38}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="297540743">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Connection:</string>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="551740824"/>
-							<reference key="NSBackgroundColor" ref="841104386"/>
-							<reference key="NSTextColor" ref="53173630"/>
-						</object>
-					</object>
-					<object class="NSButton" id="749797664">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{190, 37}, {273, 18}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="544863538">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Connect via TCP</string>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="749797664"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<object class="NSCustomResource" key="NSNormalImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSSwitch</string>
-							</object>
-							<object class="NSButtonImageSource" key="NSAlternateImage">
-								<string key="NSImageName">NSSwitch</string>
-							</object>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="1001713905">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{47, 97}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="375830244">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Login Server:</string>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="1001713905"/>
-							<reference key="NSBackgroundColor" ref="841104386"/>
-							<reference key="NSTextColor" ref="53173630"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="891253688">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{192, 95}, {200, 22}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="567776429">
-							<int key="NSCellFlags">-1804468671</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="891253688"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSColor" key="NSBackgroundColor" id="474064618">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textBackgroundColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="247257394">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textColor</string>
-								<reference key="NSColor" ref="99333719"/>
-							</object>
-						</object>
-					</object>
-					<object class="NSTextField" id="233318596">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{192, 63}, {51, 22}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="224734992">
-							<int key="NSCellFlags">-1804468671</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="233318596"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="474064618"/>
-							<reference key="NSTextColor" ref="247257394"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="331134759">
-						<reference key="NSNextResponder" ref="423647183"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{59, 65}, {128, 17}}</string>
-						<reference key="NSSuperview" ref="423647183"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="412384844">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Port:</string>
-							<reference key="NSSupport" ref="604030241"/>
-							<reference key="NSControlView" ref="331134759"/>
-							<reference key="NSBackgroundColor" ref="841104386"/>
-							<reference key="NSTextColor" ref="53173630"/>
-						</object>
-					</object>
-				</array>
-				<string key="NSFrameSize">{532, 118}</string>




More information about the commits mailing list