adium 5969:6e3d2fc25ea5: Remove Facebook protocol code once more...

commits at adium.im commits at adium.im
Thu Mar 23 08:52:03 UTC 2017


details:	http://hg.adium.im/adium/rev/6e3d2fc25ea5
revision:	5969:6e3d2fc25ea5
branch:		adium-1.5.10.3
author:		Robert Vehse <robertvehse at fastmail.fm>
date:		Thu Mar 23 09:51:47 2017 +0100

Remove Facebook protocol code once more leaving JSONKit in this time.

diffs (truncated from 20351 to 1000 lines):

diff -r f8bbf706ceac -r 6e3d2fc25ea5 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Thu Mar 23 06:56:26 2017 +0100
+++ b/Adium.xcodeproj/project.pbxproj	Thu Mar 23 09:51:47 2017 +0100
@@ -222,8 +222,6 @@
 		3403F4DB0D2EFE6D006B08FB /* AIManuallySetUserIconSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3403F4CE0D2EFE10006B08FB /* AIManuallySetUserIconSource.h */; };
 		3403F56B0D2F0BDE006B08FB /* AIServersideUserIconSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 3403F5690D2F0BDE006B08FB /* AIServersideUserIconSource.h */; };
 		3403F56C0D2F0BDE006B08FB /* AIServersideUserIconSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403F56A0D2F0BDE006B08FB /* AIServersideUserIconSource.m */; };
-		34064D100F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34064D0E0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m */; };
-		34064D110F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34064D0F0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h */; };
 		340670A90A55A4B4004E22AC /* ESGlassSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 340670A70A55A4B4004E22AC /* ESGlassSplitView.m */; };
 		34082675075B079800703011 /* Dock Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 3408254D075B078B00703011 /* Dock Icons */; };
 		340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340C1ABE0BD58FAB00D09235 /* Security.framework */; };
@@ -311,12 +309,6 @@
 		3459CBEF0A25FFBF00ECC256 /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3459CBEB0A25FFBE00ECC256 /* GetMetadataForFile.m */; };
 		345ACC970811C20F008E4D22 /* AwayStatusWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 345ACC960811C20F008E4D22 /* AwayStatusWindow.nib */; };
 		345AFAEE0A5D9A5F00D7DA6F /* AINoisyTableColumn.m in Sources */ = {isa = PBXBuildFile; fileRef = 345AFAEC0A5D9A5F00D7DA6F /* AINoisyTableColumn.m */; };
-		345D68990F1FD56B002F2D01 /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
-		345D689A0F1FD56B002F2D01 /* facebook-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68960F1FD563002F2D01 /* facebook-small.png */; };
-		345D68A20F1FD59F002F2D01 /* PurpleFacebookService.h in Headers */ = {isa = PBXBuildFile; fileRef = 345D68A00F1FD59F002F2D01 /* PurpleFacebookService.h */; };
-		345D68A30F1FD59F002F2D01 /* PurpleFacebookService.m in Sources */ = {isa = PBXBuildFile; fileRef = 345D68A10F1FD59F002F2D01 /* PurpleFacebookService.m */; };
-		345D68A80F1FD5AA002F2D01 /* PurpleFacebookAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 345D68A60F1FD5AA002F2D01 /* PurpleFacebookAccount.h */; };
-		345D68A90F1FD5AA002F2D01 /* PurpleFacebookAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 345D68A70F1FD5AA002F2D01 /* PurpleFacebookAccount.m */; };
 		345DA0680CA09AD0009F1989 /* Statuses.strings in Resources */ = {isa = PBXBuildFile; fileRef = 345DA0660CA09AD0009F1989 /* Statuses.strings */; };
 		345EE2DF0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */; };
 		345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F566A08178356001F733C /* AdiumServiceIcons.icns */; };
@@ -607,19 +599,6 @@
 		34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */; };
 		34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */; };
 		34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
-		34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
-		34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
-		34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
-		34D8153E13B663650022C8C4 /* AIFacebookXMPPAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */; };
-		34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */; };
-		34D8154013B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153613B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h */; };
-		34D8154113B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153713B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m */; };
-		34D8154213B663650022C8C4 /* AIFacebookXMPPService.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */; };
-		34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */; };
-		34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154913B663A80022C8C4 /* auth_fb.c */; };
-		34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154A13B663A80022C8C4 /* auth_fb.h */; };
-		34D8154F13B663A80022C8C4 /* fbapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154B13B663A80022C8C4 /* fbapi.c */; };
-		34D8155013B663A80022C8C4 /* fbapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154C13B663A80022C8C4 /* fbapi.h */; };
 		34D832A007CBD61A006466F2 /* ContactListDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8329F07CBD61A006466F2 /* ContactListDefaults.plist */; };
 		34D832AE07CBD62C006466F2 /* AdiumEmoticonset.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A507CBD62B006466F2 /* AdiumEmoticonset.icns */; };
 		34D832AF07CBD62C006466F2 /* AdiumScripts.icns in Resources */ = {isa = PBXBuildFile; fileRef = 34D832A607CBD62B006466F2 /* AdiumScripts.icns */; };
@@ -1043,7 +1022,6 @@
 		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 */; };
-		5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */; };
 		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"; }; };
@@ -1401,8 +1379,6 @@
 		97E4B50013E7490000A8BA53 /* AboutDialog_transp_top.png in Resources */ = {isa = PBXBuildFile; fileRef = 97E4B4FC13E7490000A8BA53 /* AboutDialog_transp_top.png */; };
 		97E4B50113E7490000A8BA53 /* Flap_192.png in Resources */ = {isa = PBXBuildFile; fileRef = 97E4B4FD13E7490000A8BA53 /* Flap_192.png */; };
 		97E4B50213E7490000A8BA53 /* Awake_192.png in Resources */ = {isa = PBXBuildFile; fileRef = 97E4B4FE13E7490000A8BA53 /* Awake_192.png */; };
-		97F7B38014E29BC500A0F6F8 /* facebook-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 97F7B37E14E29BC400A0F6F8 /* facebook-small.png */; };
-		97F7B38114E29BC500A0F6F8 /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 97F7B37F14E29BC400A0F6F8 /* facebook.png */; };
 		9E124DEC07D34C7300AA91C5 /* CBGrowlAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E124DE807D34C7300AA91C5 /* CBGrowlAlertDetailPane.m */; };
 		9E124DEE07D34C7400AA91C5 /* NEHGrowlPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E124DEA07D34C7300AA91C5 /* NEHGrowlPlugin.m */; };
 		9E124DF107D34C9100AA91C5 /* GrowlAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9E124DEF07D34C9000AA91C5 /* GrowlAlert.xib */; };
@@ -1955,8 +1931,6 @@
 		340580AB087EEFA200664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/StatusPreferences.nib; sourceTree = "<group>"; };
 		340580AC087EEFA200664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = Resources/ru.lproj/StatusSortConfiguration.nib; sourceTree = "<group>"; };
 		340580AD087EEFA300664D64 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = "Plugins/WebKit Message View/Resources/ru.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
-		34064D0E0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleFacebookAccountViewController.m; path = "Plugins/Purple Service/PurpleFacebookAccountViewController.m"; sourceTree = "<group>"; };
-		34064D0F0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleFacebookAccountViewController.h; path = "Plugins/Purple Service/PurpleFacebookAccountViewController.h"; sourceTree = "<group>"; };
 		340670790A55A044004E22AC /* sourceListBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sourceListBackground.png; path = Resources/sourceListBackground.png; sourceTree = "<group>"; };
 		340670A60A55A4B4004E22AC /* ESGlassSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESGlassSplitView.h; path = Source/ESGlassSplitView.h; sourceTree = "<group>"; };
 		340670A70A55A4B4004E22AC /* ESGlassSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESGlassSplitView.m; path = Source/ESGlassSplitView.m; sourceTree = "<group>"; };
@@ -2580,12 +2554,6 @@
 		345AF9B50A5D67EC00D7DA6F /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nl; path = Resources/nl.lproj/AppearancePrefs.nib; sourceTree = "<group>"; };
 		345AFAEB0A5D9A5F00D7DA6F /* AINoisyTableColumn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINoisyTableColumn.h; path = Source/AINoisyTableColumn.h; sourceTree = "<group>"; };
 		345AFAEC0A5D9A5F00D7DA6F /* AINoisyTableColumn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINoisyTableColumn.m; path = Source/AINoisyTableColumn.m; sourceTree = "<group>"; };
-		345D68950F1FD563002F2D01 /* facebook.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = facebook.png; path = "Plugins/Purple Service/facebook.png"; sourceTree = "<group>"; };
-		345D68960F1FD563002F2D01 /* facebook-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "facebook-small.png"; path = "Plugins/Purple Service/facebook-small.png"; sourceTree = "<group>"; };
-		345D68A00F1FD59F002F2D01 /* PurpleFacebookService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleFacebookService.h; path = "Plugins/Purple Service/PurpleFacebookService.h"; sourceTree = "<group>"; };
-		345D68A10F1FD59F002F2D01 /* PurpleFacebookService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleFacebookService.m; path = "Plugins/Purple Service/PurpleFacebookService.m"; sourceTree = "<group>"; };
-		345D68A60F1FD5AA002F2D01 /* PurpleFacebookAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleFacebookAccount.h; path = "Plugins/Purple Service/PurpleFacebookAccount.h"; sourceTree = "<group>"; };
-		345D68A70F1FD5AA002F2D01 /* PurpleFacebookAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleFacebookAccount.m; path = "Plugins/Purple Service/PurpleFacebookAccount.m"; sourceTree = "<group>"; };
 		345DA0690CA09AD6009F1989 /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path = Resources/fr.lproj/Statuses.strings; sourceTree = "<group>"; };
 		345DA06A0CA09ADD009F1989 /* ja */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path = Resources/ja.lproj/Statuses.strings; sourceTree = "<group>"; };
 		345DA06B0CA09AE0009F1989 /* it */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = it; path = Resources/it.lproj/Statuses.strings; sourceTree = "<group>"; };
@@ -3371,21 +3339,8 @@
 		34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DualWindowDefaults.plist; path = "Plugins/Dual Window Interface/DualWindowDefaults.plist"; sourceTree = "<group>"; };
 		34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "ChatCyclingDefaults-Old.plist"; path = "Resources/ChatCyclingDefaults-Old.plist"; sourceTree = "<group>"; };
 		34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ChatCyclingDefaults.plist; path = Resources/ChatCyclingDefaults.plist; sourceTree = "<group>"; };
-		34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccount.h; path = "Plugins/Purple Service/AIFacebookXMPPAccount.h"; sourceTree = "<group>"; };
-		34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPAccount.m; path = "Plugins/Purple Service/AIFacebookXMPPAccount.m"; sourceTree = "<group>"; };
-		34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccountViewController.h; path = "Plugins/Purple Service/AIFacebookXMPPAccountViewController.h"; sourceTree = "<group>"; };
-		34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPAccountViewController.m; path = "Plugins/Purple Service/AIFacebookXMPPAccountViewController.m"; sourceTree = "<group>"; };
-		34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIFacebookXMPPOauthWebViewWindow.xib; path = "Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib"; sourceTree = "<group>"; };
-		34D8153613B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPOAuthWebViewWindowController.h; path = "Plugins/Purple Service/AIFacebookXMPPOAuthWebViewWindowController.h"; sourceTree = "<group>"; };
-		34D8153713B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPOAuthWebViewWindowController.m; path = "Plugins/Purple Service/AIFacebookXMPPOAuthWebViewWindowController.m"; sourceTree = "<group>"; };
-		34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPService.h; path = "Plugins/Purple Service/AIFacebookXMPPService.h"; sourceTree = "<group>"; };
-		34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPService.m; path = "Plugins/Purple Service/AIFacebookXMPPService.m"; sourceTree = "<group>"; };
 		34D8154413B663700022C8C4 /* JSONKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSONKit.h; path = Frameworks/JSONKit/JSONKit.h; sourceTree = "<group>"; };
 		34D8154513B663700022C8C4 /* JSONKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSONKit.m; path = Frameworks/JSONKit/JSONKit.m; sourceTree = "<group>"; };
-		34D8154913B663A80022C8C4 /* auth_fb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = auth_fb.c; sourceTree = "<group>"; };
-		34D8154A13B663A80022C8C4 /* auth_fb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auth_fb.h; sourceTree = "<group>"; };
-		34D8154B13B663A80022C8C4 /* fbapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fbapi.c; sourceTree = "<group>"; };
-		34D8154C13B663A80022C8C4 /* fbapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fbapi.h; sourceTree = "<group>"; };
 		34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealRollover.tif; path = Resources/FTProgressRevealRollover.tif; sourceTree = "<group>"; };
 		34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealRollover_Selected.tif; path = Resources/FTProgressRevealRollover_Selected.tif; sourceTree = "<group>"; };
 		34D8324A07CBD53A006466F2 /* FTProgressStopRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressStopRollover_Selected.tif; path = Resources/FTProgressStopRollover_Selected.tif; sourceTree = "<group>"; };
@@ -3859,7 +3814,6 @@
 		5A17D65B130F76B4002C852F /* AIGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGradientView.h; path = Source/AIGradientView.h; sourceTree = "<group>"; };
 		5A17D65C130F76B4002C852F /* AIGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGradientView.m; path = Source/AIGradientView.m; sourceTree = "<group>"; };
 		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.nib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/AIFacebookXMPPAccountView.nib"; 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>"; };
@@ -4418,8 +4372,6 @@
 		97E4B4FC13E7490000A8BA53 /* AboutDialog_transp_top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AboutDialog_transp_top.png; path = Resources/AboutDialog_transp_top.png; sourceTree = "<group>"; };
 		97E4B4FD13E7490000A8BA53 /* Flap_192.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Flap_192.png; path = Resources/Flap_192.png; sourceTree = "<group>"; };
 		97E4B4FE13E7490000A8BA53 /* Awake_192.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Awake_192.png; path = Resources/Awake_192.png; sourceTree = "<group>"; };
-		97F7B37E14E29BC400A0F6F8 /* facebook-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "facebook-small.png"; path = "Plugins/Purple Service/facebook-small.png"; sourceTree = "<group>"; };
-		97F7B37F14E29BC400A0F6F8 /* facebook.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = facebook.png; path = "Plugins/Purple Service/facebook.png"; sourceTree = "<group>"; };
 		9C103FAE057127A500F3C158 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
 		9E124DE707D34C7300AA91C5 /* CBGrowlAlertDetailPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBGrowlAlertDetailPane.h; path = Source/CBGrowlAlertDetailPane.h; sourceTree = "<group>"; };
 		9E124DE807D34C7300AA91C5 /* CBGrowlAlertDetailPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBGrowlAlertDetailPane.m; path = Source/CBGrowlAlertDetailPane.m; sourceTree = "<group>"; };
@@ -4469,7 +4421,6 @@
 		D1B9C01C14C3AEC300D03244 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/WebKit Message View/Resources/sl.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
 		D1C1FA2514995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/AccountProxy.nib; sourceTree = "<group>"; };
 		D1C1FA2614995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/AIAdvancedInspectorPane.nib; sourceTree = "<group>"; };
-		D1C1FA2714995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = "Plugins/Purple Service/Resources/en_AU.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
 		D1C1FA2814995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = "Plugins/Twitter Plugin/Resources/en_AU.lproj/AITwitterAccountView.nib"; sourceTree = "<group>"; };
 		D1C1FA2914995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/AppearancePrefs.nib; sourceTree = "<group>"; };
 		D1C1FA2A14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = Resources/en_AU.lproj/Buttons.strings; sourceTree = "<group>"; };
@@ -4507,33 +4458,6 @@
 		D1C1FA4D14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/StatusPreferences.nib; sourceTree = "<group>"; };
 		D1C1FA4E14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = Resources/en_AU.lproj/StatusSortConfiguration.nib; sourceTree = "<group>"; };
 		D1C1FA4F14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = "Plugins/WebKit Message View/Resources/en_AU.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
-		D1C1FA5814995DF7008C94EB /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = "Plugins/Purple Service/Resources/ca.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5914995DF9008C94EB /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = cs; path = "Plugins/Purple Service/Resources/cs.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5A14995DFC008C94EB /* da */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = da; path = "Plugins/Purple Service/Resources/da.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5B14995E01008C94EB /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = "Plugins/Purple Service/Resources/de.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5C14995E2C008C94EB /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = "Plugins/Purple Service/Resources/el_GR.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5D14995E31008C94EB /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = "Plugins/Purple Service/Resources/en_GB.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5E14995E36008C94EB /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = es; path = "Plugins/Purple Service/Resources/es.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA5F14995E39008C94EB /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = "Plugins/Purple Service/Resources/fi.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6014995E3D008C94EB /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr; path = "Plugins/Purple Service/Resources/fr.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6114995E41008C94EB /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = "Plugins/Purple Service/Resources/fr_CA.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6214995E46008C94EB /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = "Plugins/Purple Service/Resources/hu.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6314995E49008C94EB /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = is; path = "Plugins/Purple Service/Resources/is.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6414995E4C008C94EB /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/Resources/it.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6514995E4F008C94EB /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = "Plugins/Purple Service/Resources/ja.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6614995E5F008C94EB /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nb; path = "Plugins/Purple Service/Resources/nb.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6714995E62008C94EB /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nl; path = "Plugins/Purple Service/Resources/nl.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6814995E65008C94EB /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = "Plugins/Purple Service/Resources/pl.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6914995E69008C94EB /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = "Plugins/Purple Service/Resources/pt_PT.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6A14995E6D008C94EB /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = "Plugins/Purple Service/Resources/pt.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6B14995E74008C94EB /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = "Plugins/Purple Service/Resources/ru.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6C14995E77008C94EB /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/Resources/sl.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6D14995E7A008C94EB /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = "Plugins/Purple Service/Resources/sv.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6E14995E7C008C94EB /* tr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = tr; path = "Plugins/Purple Service/Resources/tr.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA6F14995E80008C94EB /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_CN; path = "Plugins/Purple Service/Resources/zh_CN.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA7014995E84008C94EB /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = "Plugins/Purple Service/Resources/zh_TW.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA7114995E88008C94EB /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = "Plugins/Purple Service/Resources/sk_SK.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
-		D1C1FA7214995E8E008C94EB /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/Resources/uk.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
 		D1ED4B9E14A0DB8B00EBD8EB /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = Resources/pt.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
 		D1ED4BA214A0DB9000EBD8EB /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = Resources/pt_PT.lproj/OTRPrefs.nib; sourceTree = "<group>"; };
 		D1F92AE214C3A6F6009D7B34 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/Resources/sl.lproj/DCPurpleJabberJoinChatView.nib"; sourceTree = "<group>"; };
@@ -4878,10 +4802,6 @@
 		11EE1B480CDCFAF40097F246 /* libpurple_extensions */ = {
 			isa = PBXGroup;
 			children = (
-				34D8154913B663A80022C8C4 /* auth_fb.c */,
-				34D8154A13B663A80022C8C4 /* auth_fb.h */,
-				34D8154B13B663A80022C8C4 /* fbapi.c */,
-				34D8154C13B663A80022C8C4 /* fbapi.h */,
 				11EE1B490CDCFAF40097F246 /* oscar-adium.c */,
 				11EE1B4A0CDCFAF40097F246 /* oscar-adium.h */,
 				811033500CDE170B00EC6038 /* ssl-cdsa.c */,
@@ -5176,7 +5096,6 @@
 				81DAE8710C261E8A00780E4C /* AMPurpleTuneTooltip.m */,
 				347E39DB0A98AA4A00961B0E /* missing_image.png */,
 				77D903500B78CF1000B86C42 /* zhm */,
-				345D689D0F1FD575002F2D01 /* Facebook */,
 				34416060059FC2450019246B /* Gadu-Gadu */,
 				34B3241D09B9FF6900029361 /* IRC */,
 				34416053059FC2270019246B /* Jabber */,
@@ -5393,26 +5312,6 @@
 			name = SIMPLE;
 			sourceTree = "<group>";
 		};
-		345D689D0F1FD575002F2D01 /* Facebook */ = {
-			isa = PBXGroup;
-			children = (
-				34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */,
-				34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */,
-				5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */,
-				34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */,
-				34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */,
-				34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */,
-				34D8153613B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h */,
-				34D8153713B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m */,
-				34D8153813B663650022C8C4 /* AIFacebookXMPPService.h */,
-				34D8153913B663650022C8C4 /* AIFacebookXMPPService.m */,
-				97F7B37E14E29BC400A0F6F8 /* facebook-small.png */,
-				97F7B37F14E29BC400A0F6F8 /* facebook.png */,
-				34D8152D13B6634A0022C8C4 /* Legacy (Upgrade path) */,
-			);
-			name = Facebook;
-			sourceTree = "<group>";
-		};
 		34607EF209B22933000DB3D2 /* User Icon Changing */ = {
 			isa = PBXGroup;
 			children = (
@@ -6021,21 +5920,6 @@
 			name = "Localization Assistance";
 			sourceTree = "<group>";
 		};
-		34D8152D13B6634A0022C8C4 /* Legacy (Upgrade path) */ = {
-			isa = PBXGroup;
-			children = (
-				345D68A60F1FD5AA002F2D01 /* PurpleFacebookAccount.h */,
-				345D68A70F1FD5AA002F2D01 /* PurpleFacebookAccount.m */,
-				34064D0E0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m */,
-				34064D0F0F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h */,
-				345D68A00F1FD59F002F2D01 /* PurpleFacebookService.h */,
-				345D68A10F1FD59F002F2D01 /* PurpleFacebookService.m */,
-				345D68950F1FD563002F2D01 /* facebook.png */,
-				345D68960F1FD563002F2D01 /* facebook-small.png */,
-			);
-			name = "Legacy (Upgrade path)";
-			sourceTree = "<group>";
-		};
 		34D8154813B663730022C8C4 /* JSON Kit */ = {
 			isa = PBXGroup;
 			children = (
@@ -8696,15 +8580,6 @@
 				34E4CD5A0E68277D00D1B0DC /* ESIRCJoinChatViewController.h in Headers */,
 				34E4CD5D0E68277D00D1B0DC /* ESIRCAccountViewController.h in Headers */,
 				34E4CD600E68277D00D1B0DC /* ESIRCAccount.h in Headers */,
-				345D68A20F1FD59F002F2D01 /* PurpleFacebookService.h in Headers */,
-				345D68A80F1FD5AA002F2D01 /* PurpleFacebookAccount.h in Headers */,
-				34064D110F21B34200AA6FE3 /* PurpleFacebookAccountViewController.h in Headers */,
-				34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */,
-				34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */,
-				34D8154013B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.h in Headers */,
-				34D8154213B663650022C8C4 /* AIFacebookXMPPService.h in Headers */,
-				34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */,
-				34D8155013B663A80022C8C4 /* fbapi.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9258,11 +9133,7 @@
 				34E4CD5B0E68277D00D1B0DC /* ESIRCJoinChatView.nib in Resources */,
 				34E4CD660E68279C00D1B0DC /* irc.png in Resources */,
 				34E4CD670E68279C00D1B0DC /* PurpleDefaultsIRC.plist in Resources */,
-				345D68990F1FD56B002F2D01 /* facebook.png in Resources */,
-				345D689A0F1FD56B002F2D01 /* facebook-small.png in Resources */,
 				1150A9960FBE48D600E0BD31 /* ESIRCAccountView.nib in Resources */,
-				34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */,
-				5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9517,8 +9388,6 @@
 				97E4B50113E7490000A8BA53 /* Flap_192.png in Resources */,
 				97E4B50213E7490000A8BA53 /* Awake_192.png in Resources */,
 				7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */,
-				97F7B38014E29BC500A0F6F8 /* facebook-small.png in Resources */,
-				97F7B38114E29BC500A0F6F8 /* facebook.png in Resources */,
 				C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */,
 				5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */,
 				5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */,
@@ -9795,15 +9664,6 @@
 				34E4CD5C0E68277D00D1B0DC /* ESIRCAccountViewController.m in Sources */,
 				34E4CD5F0E68277D00D1B0DC /* ESIRCAccount.m in Sources */,
 				34E4CD610E68277D00D1B0DC /* ESIRCService.m in Sources */,
-				345D68A30F1FD59F002F2D01 /* PurpleFacebookService.m in Sources */,
-				345D68A90F1FD5AA002F2D01 /* PurpleFacebookAccount.m in Sources */,
-				34064D100F21B34200AA6FE3 /* PurpleFacebookAccountViewController.m in Sources */,
-				34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */,
-				34D8153E13B663650022C8C4 /* AIFacebookXMPPAccountViewController.m in Sources */,
-				34D8154113B663650022C8C4 /* AIFacebookXMPPOAuthWebViewWindowController.m in Sources */,
-				34D8154313B663650022C8C4 /* AIFacebookXMPPService.m in Sources */,
-				34D8154D13B663A80022C8C4 /* auth_fb.c in Sources */,
-				34D8154F13B663A80022C8C4 /* fbapi.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11834,42 +11694,6 @@
 			name = EmoticonNames.strings;
 			sourceTree = "<group>";
 		};
-		5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				5A22D6E114834F44004E15F7 /* en */,
-				D1C1FA2714995D98008C94EB /* en_AU */,
-				D1C1FA5814995DF7008C94EB /* ca */,
-				D1C1FA5914995DF9008C94EB /* cs */,
-				D1C1FA5A14995DFC008C94EB /* da */,
-				D1C1FA5B14995E01008C94EB /* de */,
-				D1C1FA5C14995E2C008C94EB /* el_GR */,
-				D1C1FA5D14995E31008C94EB /* en_GB */,
-				D1C1FA5E14995E36008C94EB /* es */,
-				D1C1FA5F14995E39008C94EB /* fi */,
-				D1C1FA6014995E3D008C94EB /* fr */,
-				D1C1FA6114995E41008C94EB /* fr_CA */,
-				D1C1FA6214995E46008C94EB /* hu */,
-				D1C1FA6314995E49008C94EB /* is */,
-				D1C1FA6414995E4C008C94EB /* it */,
-				D1C1FA6514995E4F008C94EB /* ja */,
-				D1C1FA6614995E5F008C94EB /* nb */,
-				D1C1FA6714995E62008C94EB /* nl */,
-				D1C1FA6814995E65008C94EB /* pl */,
-				D1C1FA6914995E69008C94EB /* pt_PT */,
-				D1C1FA6A14995E6D008C94EB /* pt */,
-				D1C1FA6B14995E74008C94EB /* ru */,
-				D1C1FA6C14995E77008C94EB /* sl */,
-				D1C1FA6D14995E7A008C94EB /* sv */,
-				D1C1FA6E14995E7C008C94EB /* tr */,
-				D1C1FA6F14995E80008C94EB /* zh_CN */,
-				D1C1FA7014995E84008C94EB /* zh_TW */,
-				D1C1FA7114995E88008C94EB /* sk_SK */,
-				D1C1FA7214995E8E008C94EB /* uk */,
-			);
-			name = AIFacebookXMPPAccountView.nib;
-			sourceTree = "<group>";
-		};
 		633D50ED0F9D31BD004F491E /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff -r f8bbf706ceac -r 6e3d2fc25ea5 Plists/Facebook.plist
--- a/Plists/Facebook.plist	Thu Mar 23 06:56:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Facebook</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>com.adiumX.facebook</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>AdiM</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-	<key>NSPrincipalClass</key>
-	<string>AIFacebookPlugin</string>
-</dict>
-</plist>
diff -r f8bbf706ceac -r 6e3d2fc25ea5 Plugins/Purple Service/AIFacebookXMPPAccount.h
--- a/Plugins/Purple Service/AIFacebookXMPPAccount.h	Thu Mar 23 06:56:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-//
-//  AIFacebookXMPPAccount.h
-//  Adium
-//
-//  Created by Colin Barrett on 11/18/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import "CBPurpleAccount.h"
-
- at class AIFacebookXMPPOAuthWebViewWindowController;
-
-#define ADIUM_APP_ID "164063256994618"
-#define ADIUM_API_KEY "add7b04ecedcd84645f3c32e7884682d"
-
-/* deprecated? This is called the 'App Secret' on Facebook's developer page.  */
-#define ADIUM_API_SECRET "bb9d2d9771790e69a0e943771ddf33c8"
-
-#define AIFacebookXMPPAuthProgressNotification @"AIFacebookXMPPAuthProgressNotification"
-#define KEY_FB_XMPP_AUTH_STEP @"AuthStep"
-
-typedef enum {
-	AIFacebookXMPPAuthProgressPromptingUser,
-	AIFacebookXMPPAuthProgressContactingServer,
-	AIFacebookXMPPAuthProgressPromotingForChat,
-	AIFacebookXMPPAuthProgressSuccess,
-	AIFacebookXMPPAuthProgressFailure
-} AIFacebookXMPPAuthProgressStep;
-
-
- at interface AIFacebookXMPPAccount : CBPurpleAccount {
-	AIFacebookXMPPOAuthWebViewWindowController *oAuthWC;
-    
-    NSString *oAuthToken;
-    NSUInteger networkState;
-    
-    NSURLConnection *connection; // weak
-    NSURLResponse *connectionResponse;
-    NSMutableData *connectionData;
-	
-	NSDictionary *migrationData;
-}
-
-+ (BOOL)uidIsValidForFacebook:(NSString *)inUID;
-
- at property (nonatomic, retain) AIFacebookXMPPOAuthWebViewWindowController *oAuthWC;
-- (void)requestFacebookAuthorization;
-
-- (void)oAuthWebViewController:(AIFacebookXMPPOAuthWebViewWindowController *)wc didSucceedWithToken:(NSString *)token;
-- (void)oAuthWebViewControllerDidFail:(AIFacebookXMPPOAuthWebViewWindowController *)wc;
-
- at property (nonatomic, retain) NSDictionary *migrationData;
- at end
-
- at interface AIFacebookXMPPAccount (ForSubclasses)
-- (void)didCompleteFacebookAuthorization;
- at end
diff -r f8bbf706ceac -r 6e3d2fc25ea5 Plugins/Purple Service/AIFacebookXMPPAccount.m
--- a/Plugins/Purple Service/AIFacebookXMPPAccount.m	Thu Mar 23 06:56:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,479 +0,0 @@
-//
-//  AIFacebookXMPPAccount.m
-//  Adium
-//
-//  Created by Colin Barrett on 11/18/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import "AIFacebookXMPPAccount.h"
-#import "AIFacebookXMPPService.h"
-#import <Adium/AIStatus.h>
-#import <Adium/AIStatusControllerProtocol.h>
-#import <Adium/AIListContact.h>
-#import "adiumPurpleCore.h"
-#import <libpurple/jabber.h>
-#import "ESPurpleJabberAccount.h"
-#import "auth_fb.h"
-#import "auth.h"
-
-#import <AIUtilities/AIKeychain.h>
-
-#import "AIFacebookXMPPOAuthWebViewWindowController.h"
-#import "JSONKit.h"
-
-#import <Adium/AIAccountControllerProtocol.h>
-#import <Adium/AIPasswordPromptController.h>
-#import <Adium/AIService.h>
-
-#import <libpurple/auth.h>
-#import "auth_fb.h"
-
-enum {
-    AINoNetworkState,
-    AIMeGraphAPINetworkState,
-    AIPromoteSessionNetworkState
-};
-
- at interface AIFacebookXMPPAccount ()
-
- at property (nonatomic, copy) NSString *oAuthToken;
- at property (nonatomic, assign) NSUInteger networkState;
- at property (nonatomic, assign) NSURLConnection *connection; // assign because NSURLConnection retains its delegate.
- at property (nonatomic, retain) NSURLResponse *connectionResponse;
- at property (nonatomic, retain) NSMutableData *connectionData;
-
-- (void)meGraphAPIDidFinishLoading:(NSData *)graphAPIData response:(NSURLResponse *)response error:(NSError *)inError;
-- (void)promoteSessionDidFinishLoading:(NSData *)secretData response:(NSURLResponse *)response error:(NSError *)inError;
- at end
-
- at implementation AIFacebookXMPPAccount
-
- at synthesize oAuthWC;
- at synthesize migrationData;
- at synthesize oAuthToken;
- at synthesize networkState, connection, connectionResponse, connectionData;
-
-+ (BOOL)uidIsValidForFacebook:(NSString *)inUID
-{
-	return ((inUID.length > 0) &&
-			[inUID stringByTrimmingCharactersInSet:[NSCharacterSet decimalDigitCharacterSet]].length == 0);
-}
-
-- (id)initWithUID:(NSString *)inUID internalObjectID:(NSString *)inInternalObjectID service:(AIService *)inService
-{
-	if ((self = [super initWithUID:inUID internalObjectID:inInternalObjectID service:inService])) {
-		if (![[self class] uidIsValidForFacebook:self.UID]) {
-			[self setValue:[NSNumber numberWithBool:YES]
-			   forProperty:@"Prompt For Password On Next Connect"
-					notify:NotifyNever];
-		}
-	}
-	
-	return self;
-}
-
-- (void)dealloc
-{
-    [oAuthWC release];
-    [oAuthToken release];
-    
-    [connection cancel];
-    [connectionResponse release];
-    [connectionData release];
-
-    [super dealloc];
-}
-
-#pragma mark Connectivitiy
-
-- (const char*)protocolPlugin
-{
-	return "prpl-jabber";
-}
-
-- (NSString *)serverSuffix
-{
-	return @"@chat.facebook.com";
-}
-
-/* Specify a host for network-reachability-code purposes */
-- (NSString *)host
-{
-	return @"chat.facebook.com";
-}
-
-- (NSString *)apiSecretAccountName
-{
-	return [NSString stringWithFormat:@"Adium.FB.%@", [self internalObjectID]];
-}
-
-- (void)configurePurpleAccount
-{
-	[super configurePurpleAccount];
-
-	purple_account_set_username(account, self.purpleAccountName);
-	purple_account_set_string(account, "connection_security", "");
-    purple_account_set_string(account, "fb_api_key", ADIUM_API_KEY);
-
-/* 
- //Uncomment along with storage code in promoteSessionDidFinishLoading::: to use the session secret. 
-	NSString *apiSecret = [[AIKeychain defaultKeychain_error:NULL] findGenericPasswordForService:self.service.serviceID
-																						 account:self.apiSecretAccountName
-																					keychainItem:NULL
-																						   error:NULL];	
-	purple_account_set_string(account, "fb_api_secret", [apiSecret UTF8String]);
-*/	
-
-    purple_account_set_string(account, "fb_api_secret", ADIUM_API_SECRET);
-}
-
-
-/* Add the authentication mechanism for X-FACEBOOK-PLATFORM. Note that if the server offers it,
- * it will be used preferentially over any other mechanism e.g. DIGEST-MD5. */
-- (void)setFacebookMechEnabled:(BOOL)inEnabled
-{
-	static BOOL enabledFacebookMech = NO;
-	if (inEnabled != enabledFacebookMech) {
-		if (inEnabled)
-			jabber_auth_add_mech(jabber_auth_get_fb_mech());
-		else
-			jabber_auth_remove_mech(jabber_auth_get_fb_mech());
-		
-		enabledFacebookMech = inEnabled;
-	}
-}
-
-- (void)connect
-{
-	[self setFacebookMechEnabled:YES];
-	[super connect];
-}
-
-- (void)didConnect
-{
-	[self setFacebookMechEnabled:NO];
-	[super didConnect];	
-}
-
-- (void)didDisconnect
-{
-	[self setFacebookMechEnabled:NO];
-	[super didDisconnect];	
-}
-
-- (const char *)purpleAccountName
-{
-	NSString	*userNameWithHost = nil, *completeUserName = nil;
-	BOOL		serverAppendedToUID;
-	
-	serverAppendedToUID = ([UID rangeOfString:[self serverSuffix]
-									  options:(NSCaseInsensitiveSearch | NSBackwardsSearch | NSAnchoredSearch)].location != NSNotFound);
-	
-	if (serverAppendedToUID) {
-		userNameWithHost = UID;
-	} else {
-		userNameWithHost = [UID stringByAppendingString:[self serverSuffix]];
-	}
-	
-	completeUserName = [NSString stringWithFormat:@"-%@/Adium" ,userNameWithHost];
-	
-	return [completeUserName UTF8String];
-}
-
-- (BOOL)encrypted
-{
-	return NO;
-}
-
-- (BOOL)allowAccountUnregistrationIfSupportedByLibpurple
-{
-	return NO;
-}
-
-/*!
- * @brief Password entered callback
- *
- * Callback after the user enters her password for connecting; finish the connect process.
- */
-- (void)passwordReturnedForConnect:(NSString *)inPassword returnCode:(AIPasswordPromptReturn)returnCode context:(id)inContext
-{
-    if ((returnCode == AIPasswordPromptOKReturn) && (inPassword.length == 0)) {
-		/* No password retrieved from the keychain */
-		[self requestFacebookAuthorization];
-
-	} else {
-		[self setValue:nil
-		   forProperty:@"mustPromptForPasswordOnNextConnect"
-				notify:NotifyNever];
-		[super passwordReturnedForConnect:inPassword returnCode:returnCode context:inContext];
-	}
-}
-
-- (void)retrievePasswordThenConnect
-{
-	if ([self boolValueForProperty:@"Prompt For Password On Next Connect"] ||
-		[self boolValueForProperty:@"mustPromptForPasswordOnNextConnect"])
-		/* We attempted to connect, but we had incorrect authorization. Display our auth request window. */
-		[self requestFacebookAuthorization];
-
-	else {
-		/* Retrieve the user's password. Never prompt for a password, as we'll implement our own authorization handling
-		 * if the password can't be retrieved.
-		 */
-		[adium.accountController passwordForAccount:self 
-									   promptOption:AIPromptNever
-									notifyingTarget:self
-										   selector:@selector(passwordReturnedForConnect:returnCode:context:)
-											context:nil];	
-	}
-}
-
-#pragma mark Account configuration
-
-- (void)setName:(NSString *)name UID:(NSString *)inUID
-{
-	[self filterAndSetUID:inUID];
-	
-	[self setFormattedUID:name notify:NotifyNever];
-}
-
-#pragma mark Contacts
-
-/*!
- * @brief Set an alias for a contact
- *
- * Normally, we consider the name a 'serverside alias' unless it matches the UID's characters
- * However, the UID in facebook should never be presented to the user if possible; it's for internal use
- * only.  We'll therefore consider any alias a formatted UID such that it will replace the UID when displayed
- * in Adium.
- */
-- (void)updateContact:(AIListContact *)theContact toAlias:(NSString *)purpleAlias
-{
-	if (![purpleAlias isEqualToString:theContact.formattedUID] && 
-		![purpleAlias isEqualToString:theContact.UID]) {
-		[theContact setFormattedUID:purpleAlias
-							 notify:NotifyLater];
-		
-		//Apply any changes
-		[theContact notifyOfChangedPropertiesSilently:silentAndDelayed];
-	}
-}
-
-- (NSMutableArray *)arrayOfDictionariesFromPurpleNotifyUserInfo:(PurpleNotifyUserInfo *)user_info forContact:(AIListContact *)contact
-{
-	NSMutableArray *array = [super arrayOfDictionariesFromPurpleNotifyUserInfo:user_info forContact:contact];
-	
-	NSString *displayUID = contact.UID;
-	displayUID = [displayUID stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"-"]];
-	if ([displayUID hasSuffix:@"@chat.facebook.com"])
-		displayUID = [displayUID substringToIndex:(displayUID.length - @"@chat.facebook.com".length)];
-
-	[array addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-					  AILocalizedString(@"Facebook ID", nil), KEY_KEY,
-					  displayUID, KEY_VALUE,
-					  nil]];
-
-	return array;
-}
-
-#pragma mark Authorization
-
-- (void)requestFacebookAuthorization
-{
-	self.oAuthWC = [[[AIFacebookXMPPOAuthWebViewWindowController alloc] init] autorelease];
-	self.oAuthWC.account = self;
-
-	[[NSNotificationCenter defaultCenter] postNotificationName:AIFacebookXMPPAuthProgressNotification
-														object:self
-													  userInfo:
-	 [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:AIFacebookXMPPAuthProgressPromptingUser]
-								 forKey:KEY_FB_XMPP_AUTH_STEP]];
-
-	if (![[self class] uidIsValidForFacebook:self.UID]) {
-		/* We have a UID which isn't a Facebook numeric username. That can come from:
-		 *	 1. The setup wizard
-		 *   2. Facebook-HTTP account from Adium <= 1.4.2
-		 */
-		self.oAuthWC.autoFillUsername = self.UID;
-		self.oAuthWC.autoFillPassword = [adium.accountController passwordForAccount:self];
-		self.oAuthWC.isMigrating = ![self.service.serviceID isEqualToString:FACEBOOK_XMPP_SERVICE_ID];
-
-		self.migrationData = [NSDictionary dictionaryWithObjectsAndKeys:
-							  self.UID, @"originalUID",
-							  self.service.serviceID, @"originalServiceID",
-							  nil];
-	}
-
-	[self.oAuthWC showWindow:self];
-}
-
-- (void)oAuthWebViewController:(AIFacebookXMPPOAuthWebViewWindowController *)wc didSucceedWithToken:(NSString *)token
-{
-    [self setOAuthToken:token];
-    
-    NSString *urlstring = [NSString stringWithFormat:@"https://graph.facebook.com/me?access_token=%@", [self oAuthToken]];
-    NSURL *url = [NSURL URLWithString:[urlstring stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
-    NSURLRequest *request = [NSURLRequest requestWithURL:url];
-    
-    self.networkState = AIMeGraphAPINetworkState;
-    self.connectionData = [NSMutableData data];
-    self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
-	
-	[[NSNotificationCenter defaultCenter] postNotificationName:AIFacebookXMPPAuthProgressNotification
-														object:self
-													  userInfo:
-	 [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:AIFacebookXMPPAuthProgressContactingServer]
-								 forKey:KEY_FB_XMPP_AUTH_STEP]];	
-}
-
-- (void)oAuthWebViewControllerDidFail:(AIFacebookXMPPOAuthWebViewWindowController *)wc
-{
-	[self setOAuthToken:nil];
-
-	[[NSNotificationCenter defaultCenter] postNotificationName:AIFacebookXMPPAuthProgressNotification
-														object:self
-													  userInfo:
-	 [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:AIFacebookXMPPAuthProgressFailure]
-								 forKey:KEY_FB_XMPP_AUTH_STEP]];	
-	
-}
-
-- (void)meGraphAPIDidFinishLoading:(NSData *)graphAPIData response:(NSURLResponse *)inResponse error:(NSError *)inError
-{
-    if (inError) {
-        NSLog(@"error loading graph API: %@", inError);
-        // TODO: indicate setup failed 
-        return;
-    }
-    
-    NSError *error = nil;
-    NSDictionary *resp = [graphAPIData objectFromJSONDataWithParseOptions:JKParseOptionNone error:&error];
-    if (!resp) {
-        NSLog(@"error decoding graph API response: %@", error);
-        // TODO: indicate setup failed
-        return;
-    }
-    
-    NSString *uuid = [resp objectForKey:@"id"];
-    NSString *name = [resp objectForKey:@"name"];
-    
-    /* Passwords are keyed by UID, so we need to make this change before storing the password */
-	[self setName:name UID:uuid];
-        
-    NSString *secretURLString = [NSString stringWithFormat:@"https://api.facebook.com/method/auth.promoteSession?access_token=%@&format=JSON", [self oAuthToken]];
-    NSURL *secretURL = [NSURL URLWithString:[secretURLString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-    NSURLRequest *secretRequest = [NSURLRequest requestWithURL:secretURL];
-
-    self.networkState = AIPromoteSessionNetworkState;
-    self.connectionData = [NSMutableData data];
-    self.connection = [NSURLConnection connectionWithRequest:secretRequest delegate:self];
-	
-	[[NSNotificationCenter defaultCenter] postNotificationName:AIFacebookXMPPAuthProgressNotification
-														object:self
-													  userInfo:
-	 [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:AIFacebookXMPPAuthProgressPromotingForChat]
-								 forKey:KEY_FB_XMPP_AUTH_STEP]];		
-}
-
-- (void)didCompleteFacebookAuthorization
-{
-	/* Restart the connect process; we're currently considered 'connecting', so passwordReturnedForConnect:::
-	 * isn't going to restart it for us. */
-	[self connect];
-	
-	[[NSNotificationCenter defaultCenter] postNotificationName:AIFacebookXMPPAuthProgressNotification
-														object:self
-													  userInfo:
-	 [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:AIFacebookXMPPAuthProgressSuccess]
-								 forKey:KEY_FB_XMPP_AUTH_STEP]];	
-}
-
-- (void)promoteSessionDidFinishLoading:(NSData *)secretData response:(NSURLResponse *)response error:(NSError *)inError
-{
-    if (inError) {
-        NSLog(@"error promoting session: %@", inError);
-        // TODO: indicate setup failed
-        return;
-    }    
-    
-
-	/* Uncomment the below to store the Session Secret in the keychain. It doesn't seem to be used.
-	 
-	 NSString *secret = [[[NSString alloc] initWithData:secretData encoding:NSUTF8StringEncoding] autorelease];
-	 secret = [secret substringWithRange:NSMakeRange(1, [secret length] - 2)]; // strip off the quotes    
-	 
-	 
-	//Delete before adding; otherwise we'll just get errSecDuplicateItem
-	[[AIKeychain defaultKeychain_error:NULL] deleteGenericPasswordForService:self.service.serviceID
-																	 account:self.apiSecretAccountName
-																	   error:NULL];
-	[[AIKeychain defaultKeychain_error:NULL] addGenericPassword:secret
-													 forService:self.service.serviceID
-														account:self.apiSecretAccountName
-												   keychainItem:NULL
-														  error:NULL];
-	 */
-	
-	NSString *sessionKey = [self oAuthToken];
-	[[adium accountController] setPassword:sessionKey forAccount:self];
-
-	/* When we're newly authorized, connect! */
-	[self passwordReturnedForConnect:sessionKey
-						  returnCode:AIPasswordPromptOKReturn
-							 context:nil];
-
-	[self didCompleteFacebookAuthorization];
-
-	self.oAuthWC = nil;
-    self.oAuthToken = nil;
-}
-
-#pragma mark NSURLConnectionDelegate
-
-- (void)connection:(NSURLConnection *)inConnection didReceiveResponse:(NSURLResponse *)response
-{
-    [[self connectionData] setLength:0];
-    [self setConnectionResponse:response];
-}
-
-- (void)connection:(NSURLConnection *)inConnection didReceiveData:(NSData *)data
-{
-    [[self connectionData] appendData:data];
-}
-
-- (void)connection:(NSURLConnection *)inConnection didFailWithError:(NSError *)error
-{
-    NSUInteger state = [self networkState];
-    
-    [self setNetworkState:AINoNetworkState];
-    [self setConnection:nil];
-    [self setConnectionResponse:nil];
-    [self setConnectionData:nil];    
-    
-    if (state == AIMeGraphAPINetworkState) {
-        [self meGraphAPIDidFinishLoading:nil response:nil error:error];
-    } else if (state == AIPromoteSessionNetworkState) {
-        [self promoteSessionDidFinishLoading:nil response:nil error:error];
-    }
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)inConnection
-{
-    NSURLResponse *response = [[[self connectionResponse] retain] autorelease];
-    NSMutableData *data = [[[self connectionData] retain] autorelease];
-    NSUInteger state = [self networkState]; 
-    
-    [self setNetworkState:AINoNetworkState];
-    [self setConnection:nil];
-    [self setConnectionResponse:nil];
-    [self setConnectionData:nil];
-    
-    if (state == AIMeGraphAPINetworkState) {
-        [self meGraphAPIDidFinishLoading:data response:response error:nil];
-    } else if (state == AIPromoteSessionNetworkState) {
-        [self promoteSessionDidFinishLoading:data response:response error:nil];
-    }    
-}
-
- at end
diff -r f8bbf706ceac -r 6e3d2fc25ea5 Plugins/Purple Service/AIFacebookXMPPAccountViewController.h
--- a/Plugins/Purple Service/AIFacebookXMPPAccountViewController.h	Thu Mar 23 06:56:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-//  AIFacebookXMPPAccountViewController.h
-//  Adium
-//
-//  Created by Colin Barrett on 11/18/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import "PurpleAccountViewController.h"
-#import <WebKit/WebKit.h>
-
- at interface AIFacebookXMPPAccountViewController : PurpleAccountViewController {
-	AILocalizationTextField *label_instructions;
-	AILocalizationButton *button_OAuthStart;
-	NSTextField *textField_OAuthStatus;
-	NSProgressIndicator *spinner;
-	
-	NSButton *button_help;
-}
-
- at property (assign) IBOutlet NSProgressIndicator *spinner;
- at property (assign) IBOutlet NSTextField *textField_OAuthStatus;
- at property (assign) IBOutlet NSButton *button_OAuthStart;
- at property (assign) IBOutlet NSButton *button_help;
-
-- (IBAction)showHelp:(id)sender;
-
- at end
diff -r f8bbf706ceac -r 6e3d2fc25ea5 Plugins/Purple Service/AIFacebookXMPPAccountViewController.m
--- a/Plugins/Purple Service/AIFacebookXMPPAccountViewController.m	Thu Mar 23 06:56:26 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-//
-//  AIFacebookXMPPAccountViewController.m
-//  Adium
-//
-//  Created by Colin Barrett on 11/18/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import "AIFacebookXMPPAccount.h"
-#import "AIFacebookXMPPAccountViewController.h"
-#import <Adium/AIAccount.h>
-#import <Adium/AIAccountControllerProtocol.h>
-#import <AIUtilities/AIStringAdditions.h>
-
-#import "PurpleFacebookAccount.h"
-
- at interface AIFacebookXMPPAccountViewController ()
-- (void)authProgressDidChange:(NSNotification *)notification;
- at end
-
- at implementation AIFacebookXMPPAccountViewController
-
- at synthesize spinner, textField_OAuthStatus, button_OAuthStart, button_help;
-
-- (void)dealloc
-{
-	[[NSNotificationCenter defaultCenter] removeObserver:self];
-    [super dealloc];
-}
-
-- (NSView *)optionsView
-{
-    return nil;
-}
-
-- (NSView *)privacyView
-{
-    return nil;
-}
-
-- (NSView *)setupView
-{	
-	return view_setup;
-}
-
-- (NSString *)nibName
-{
-    return @"AIFacebookXMPPAccountView";
-}
-
-/*!
- * @brief Configure controls
- */
-- (void)configureForAccount:(AIAccount *)inAccount
-{
-	[super configureForAccount:inAccount];
-	



More information about the commits mailing list