--- a/Adium.xcodeproj/project.pbxproj Wed Mar 22 07:08:58 2017 +0100
+++ b/Adium.xcodeproj/project.pbxproj Wed Mar 22 21:08:38 2017 +0100
@@ -275,15 +275,6 @@
34382CEA0A50386C004BF6A2 /* DCMessageContextDisplayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34382CE60A50386C004BF6A2 /* DCMessageContextDisplayPlugin.m */; };
34382CEF0A50387A004BF6A2 /* MessageContextDisplayDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34382CEE0A50387A004BF6A2 /* MessageContextDisplayDefaults.plist */; };
343BB5020C96CB2000506F9B /* AINewBookmarkWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A970670C965F6900F46006 /* AINewBookmarkWindowController.m */; };
- 343BB5B90C96D54000506F9B /* PurpleMySpaceService.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BB5B70C96D54000506F9B /* PurpleMySpaceService.h */; };
- 343BB5BA0C96D54000506F9B /* PurpleMySpaceService.m in Sources */ = {isa = PBXBuildFile; fileRef = 343BB5B80C96D54000506F9B /* PurpleMySpaceService.m */; };
- 343BB5BD0C96D55400506F9B /* PurpleMySpaceAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BB5BB0C96D55400506F9B /* PurpleMySpaceAccount.h */; };
- 343BB5BE0C96D55400506F9B /* PurpleMySpaceAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 343BB5BC0C96D55400506F9B /* PurpleMySpaceAccount.m */; };
- 343BB5C10C96D56B00506F9B /* PurpleMySpaceAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BB5BF0C96D56B00506F9B /* PurpleMySpaceAccountViewController.h */; };
- 343BB5C20C96D56B00506F9B /* PurpleMySpaceAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343BB5C00C96D56B00506F9B /* PurpleMySpaceAccountViewController.m */; };
- 343BB5C40C96D57900506F9B /* PurpleDefaultsMySpace.plist in Resources */ = {isa = PBXBuildFile; fileRef = 343BB5C30C96D57900506F9B /* PurpleDefaultsMySpace.plist */; };
- 343BB63B0C96DC1100506F9B /* MySpace-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 343BB6390C96DC1100506F9B /* MySpace-small.png */; };
- 343BB63C0C96DC1100506F9B /* MySpace-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 343BB63A0C96DC1100506F9B /* MySpace-large.png */; };
343EB3FE08086D2F00E27095 /* AccountProxy.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB3FD08086D2F00E27095 /* AccountProxy.nib */; };
343EB40208086D9000E27095 /* AppearancePrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB40108086D9000E27095 /* AppearancePrefs.nib */; };
343EB41708086D9100E27095 /* StatusSortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41608086D9100E27095 /* StatusSortConfiguration.nib */; };
@@ -2338,15 +2329,6 @@
343A7F2D06935DC500150CEC /* ESPurpleMeanwhileAccount.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPurpleMeanwhileAccount.h; path = "Plugins/Purple Service/ESPurpleMeanwhileAccount.h"; sourceTree = "<group>"; };
343A7F3706935DD700150CEC /* ESMeanwhileService.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESMeanwhileService.m; path = "Plugins/Purple Service/ESMeanwhileService.m"; sourceTree = "<group>"; };
343A7F3806935DD700150CEC /* ESMeanwhileService.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESMeanwhileService.h; path = "Plugins/Purple Service/ESMeanwhileService.h"; sourceTree = "<group>"; };
- 343BB5B70C96D54000506F9B /* PurpleMySpaceService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleMySpaceService.h; path = "Plugins/Purple Service/PurpleMySpaceService.h"; sourceTree = "<group>"; };
- 343BB5B80C96D54000506F9B /* PurpleMySpaceService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleMySpaceService.m; path = "Plugins/Purple Service/PurpleMySpaceService.m"; sourceTree = "<group>"; };
- 343BB5BB0C96D55400506F9B /* PurpleMySpaceAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleMySpaceAccount.h; path = "Plugins/Purple Service/PurpleMySpaceAccount.h"; sourceTree = "<group>"; };
- 343BB5BC0C96D55400506F9B /* PurpleMySpaceAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleMySpaceAccount.m; path = "Plugins/Purple Service/PurpleMySpaceAccount.m"; sourceTree = "<group>"; };
- 343BB5BF0C96D56B00506F9B /* PurpleMySpaceAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PurpleMySpaceAccountViewController.h; path = "Plugins/Purple Service/PurpleMySpaceAccountViewController.h"; sourceTree = "<group>"; };
- 343BB5C00C96D56B00506F9B /* PurpleMySpaceAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PurpleMySpaceAccountViewController.m; path = "Plugins/Purple Service/PurpleMySpaceAccountViewController.m"; sourceTree = "<group>"; };
- 343BB5C30C96D57900506F9B /* PurpleDefaultsMySpace.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = PurpleDefaultsMySpace.plist; path = "Plugins/Purple Service/PurpleDefaultsMySpace.plist"; sourceTree = "<group>"; };
- 343BB6390C96DC1100506F9B /* MySpace-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "MySpace-small.png"; path = "Plugins/Purple Service/MySpace-small.png"; sourceTree = "<group>"; };
- 343BB63A0C96DC1100506F9B /* MySpace-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "MySpace-large.png"; path = "Plugins/Purple Service/MySpace-large.png"; sourceTree = "<group>"; };
343C45E20816C0FE00FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/WebKit Message View/Resources/it.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
343C45E50816C13300FF5FA7 /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = Resources/nl.lproj/Localizable.strings; sourceTree = "<group>"; };
343C46040816CC6800FF5FA7 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/Resources/it.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
@@ -5148,22 +5130,6 @@
- 343BB51B0C96CCD100506F9B /* MySpace */ = {
- 343BB5B70C96D54000506F9B /* PurpleMySpaceService.h */,
- 343BB5B80C96D54000506F9B /* PurpleMySpaceService.m */,
- 343BB5BB0C96D55400506F9B /* PurpleMySpaceAccount.h */,
- 343BB5BC0C96D55400506F9B /* PurpleMySpaceAccount.m */,
- 343BB5BF0C96D56B00506F9B /* PurpleMySpaceAccountViewController.h */,
- 343BB5C00C96D56B00506F9B /* PurpleMySpaceAccountViewController.m */,
- 343BB5C30C96D57900506F9B /* PurpleDefaultsMySpace.plist */,
- 343BB6390C96DC1100506F9B /* MySpace-small.png */,
- 343BB63A0C96DC1100506F9B /* MySpace-large.png */,
- sourceTree = "<group>";
343C89B005704DEC005E0632 /* Address Book Integration */ = {
@@ -5215,7 +5181,6 @@
34B3241D09B9FF6900029361 /* IRC */,
34416053059FC2270019246B /* Jabber */,
343A7F2206935DAF00150CEC /* Meanwhile */,
- 343BB51B0C96CCD100506F9B /* MySpace */,
34415960059F94F80019246B /* Oscar */,
34C2E6650634CF010018E5D2 /* Novell GroupWise */,
345A7B560954ACD900FF3113 /* SIMPLE */,
@@ -8718,9 +8683,6 @@
346545250C8F6AAD0046ED68 /* AMPurpleJabberNode.h in Headers */,
346545B90C8F71380046ED68 /* AMPurpleJabberAdHocCommand.h in Headers */,
346545CB0C8F73000046ED68 /* AMPurpleJabberAdHocPing.h in Headers */,
- 343BB5B90C96D54000506F9B /* PurpleMySpaceService.h in Headers */,
- 343BB5BD0C96D55400506F9B /* PurpleMySpaceAccount.h in Headers */,
- 343BB5C10C96D56B00506F9B /* PurpleMySpaceAccountViewController.h in Headers */,
11EE1B4E0CDCFAF40097F246 /* oscar-adium.h in Headers */,
811036180CDE8A2500EC6038 /* AIPurpleCertificateViewer.h in Headers */,
811036250CDE8C2100EC6038 /* adiumPurpleCertificateTrustWarning.h in Headers */,
@@ -9290,9 +9252,6 @@
8173C5760C4C3DB800C9E64E /* downloadprogress.png in Resources */,
346544DB0C8F686B0046ED68 /* AMPurpleJabberXMLConsole.nib in Resources */,
346544DC0C8F686B0046ED68 /* AMPurpleJabberDiscoveryBrowser.nib in Resources */,
- 343BB5C40C96D57900506F9B /* PurpleDefaultsMySpace.plist in Resources */,
- 343BB63B0C96DC1100506F9B /* MySpace-small.png in Resources */,
- 343BB63C0C96DC1100506F9B /* MySpace-large.png in Resources */,
34EF99AA0E2EB35A003E5DC7 /* PurpleDefaultsMobileMe.plist in Resources */,
34EF9A320E2EB637003E5DC7 /* MobileMe-large.png in Resources */,
34EF9A330E2EB637003E5DC7 /* MobileMe-small.png in Resources */,
@@ -9820,9 +9779,6 @@
346545260C8F6AAD0046ED68 /* AMPurpleJabberNode.m in Sources */,
346545BA0C8F71380046ED68 /* AMPurpleJabberAdHocCommand.m in Sources */,
346545CC0C8F73000046ED68 /* AMPurpleJabberAdHocPing.m in Sources */,
- 343BB5BA0C96D54000506F9B /* PurpleMySpaceService.m in Sources */,
- 343BB5BE0C96D55400506F9B /* PurpleMySpaceAccount.m in Sources */,
- 343BB5C20C96D56B00506F9B /* PurpleMySpaceAccountViewController.m in Sources */,
11EE1B4D0CDCFAF40097F246 /* oscar-adium.c in Sources */,
11EE1B4F0CDCFAF40097F246 /* ssl-openssl.c in Sources */,
11EE1B500CDCFAF40097F246 /* ssl.c in Sources */,
--- a/Dependencies/phases/build_purple.sh Wed Mar 22 07:08:58 2017 +0100
+++ b/Dependencies/phases/build_purple.sh Wed Mar 22 21:08:38 2017 +0100
@@ -59,7 +59,7 @@
quiet pushd "$ROOTDIR/source/libpurple"
- PROTOCOLS="bonjour,gg,irc,jabber,msn,myspace,novell,oscar,"
+ PROTOCOLS="bonjour,gg,irc,jabber,msn,novell,oscar," PROTOCOLS+="sametime,simple,yahoo,zephyr"
# Leopard's 64-bit Kerberos library is missing symbols, as evidenced by
--- a/Plugins/Purple Service/CBPurpleServicePlugin.m Wed Mar 22 07:08:58 2017 +0100
+++ b/Plugins/Purple Service/CBPurpleServicePlugin.m Wed Mar 22 21:08:38 2017 +0100
@@ -49,7 +49,6 @@
[AIGTalkService registerService];
[ESIRCService registerService];
[AILiveJournalService registerService];
- [PurpleMySpaceService 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.
--- a/Plugins/Purple Service/PurpleServices.h Wed Mar 22 07:08:58 2017 +0100
+++ b/Plugins/Purple Service/PurpleServices.h Wed Mar 22 21:08:38 2017 +0100
@@ -25,7 +25,6 @@
#import "AILiveJournalService.h"
#import "ESJabberService.h"
#import "ESMeanwhileService.h"
-#import "PurpleMySpaceService.h"
#import "ESNovellService.h"
#import "ESSimpleService.h"
#import "ESZephyrService.h"