adium 5944:20f3250e7e6f: Remove MySpace protocol.
commits at adium.im
commits at adium.im
Sun Sep 4 20:55:04 UTC 2016
details: http://hg.adium.im/adium/rev/20f3250e7e6f
revision: 5944:20f3250e7e6f
branch: adium-1.6
author: Robert Vehse <robertvehse at fastmail.fm>
date: Sun Sep 04 22:54:53 2016 +0200
Remove MySpace protocol.
diffs (617 lines):
diff -r 01bd312edc85 -r 20f3250e7e6f Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Sep 04 21:35:34 2016 +0200
+++ b/Adium.xcodeproj/project.pbxproj Sun Sep 04 22:54:53 2016 +0200
@@ -1341,6 +1341,7 @@
761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D587F1636C60100210B12 /* AINewMessageTableView.m */; };
761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */; };
761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58851636F94200210B12 /* AINewMessageSearchField.m */; };
+ 761D6A251ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */; };
7652804C175FC0F500710EC8 /* RequestFieldBoolean.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7652803F175FC0EB00710EC8 /* RequestFieldBoolean.xib */; };
7652804D175FC0F500710EC8 /* RequestFieldChoice.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528040175FC0EB00710EC8 /* RequestFieldChoice.xib */; };
7652804E175FC0F500710EC8 /* RequestFieldInteger.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528041175FC0EB00710EC8 /* RequestFieldInteger.xib */; };
@@ -1354,7 +1355,6 @@
765F5D71162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5D70162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib */; };
765F5D74162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */; };
765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
- 761D6A251ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */; };
7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
76674647178D8A9000F65048 /* AIOTRTopBarUnverifiedContactController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76674646178D8A9000F65048 /* AIOTRTopBarUnverifiedContactController.m */; };
@@ -4421,6 +4421,8 @@
761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTextFieldCell.m; path = Source/AINewMessageTextFieldCell.m; sourceTree = "<group>"; };
761D58841636F94200210B12 /* AINewMessageSearchField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageSearchField.h; path = Source/AINewMessageSearchField.h; sourceTree = "<group>"; };
761D58851636F94200210B12 /* AINewMessageSearchField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageSearchField.m; path = Source/AINewMessageSearchField.m; sourceTree = "<group>"; };
+ 761D6A241ACC5F0B002079F2 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 761D6A261ACC5F0F002079F2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/Resources/sl.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
7652803F175FC0EB00710EC8 /* RequestFieldBoolean.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldBoolean.xib; path = "Plugins/Purple Service/Request UI/RequestFieldBoolean.xib"; sourceTree = "<group>"; };
76528040175FC0EB00710EC8 /* RequestFieldChoice.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldChoice.xib; path = "Plugins/Purple Service/Request UI/RequestFieldChoice.xib"; sourceTree = "<group>"; };
76528041175FC0EB00710EC8 /* RequestFieldInteger.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldInteger.xib; path = "Plugins/Purple Service/Request UI/RequestFieldInteger.xib"; sourceTree = "<group>"; };
@@ -4436,8 +4438,6 @@
765F5D72162F48FA00C57904 /* AIOTRSMPSharedSecretWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRSMPSharedSecretWindowController.h; path = Source/AIOTRSMPSharedSecretWindowController.h; sourceTree = "<group>"; };
765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRSMPSharedSecretWindowController.m; path = Source/AIOTRSMPSharedSecretWindowController.m; sourceTree = "<group>"; };
765F5DC61635934400C57904 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AIRejoinGroupChatTopBar.xib; sourceTree = "<group>"; };
- 761D6A241ACC5F0B002079F2 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
- 761D6A261ACC5F0F002079F2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/Resources/sl.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
76674645178D8A8F00F65048 /* AIOTRTopBarUnverifiedContactController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRTopBarUnverifiedContactController.h; path = Source/AIOTRTopBarUnverifiedContactController.h; sourceTree = "<group>"; };
76674646178D8A9000F65048 /* AIOTRTopBarUnverifiedContactController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRTopBarUnverifiedContactController.m; path = Source/AIOTRTopBarUnverifiedContactController.m; sourceTree = "<group>"; };
@@ -9557,6 +9557,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AI;
+ LastTestingUpgradeCheck = 0730;
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "The Adium Team";
};
@@ -9720,7 +9721,7 @@
3485DBC309EBCE7400232CC4 /* PurpleMultilineRequestWindow.xib in Resources */,
3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.xib in Resources */,
761D6A251ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib in Resources */,
- 3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.nib in Resources */,
+ 3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.xib in Resources */,
3485DBD009EBCE8200232CC4 /* Localizable.strings in Resources */,
34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.xib in Resources */,
34E0368E0A75AA4F00394F11 /* ESPurpleICQAccountView.xib in Resources */,
@@ -12476,15 +12477,6 @@
name = Localizable.strings;
sourceTree = "<group>";
};
- 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */ = {
- isa = PBXVariantGroup;
- children = (
- 765F5DC61635934400C57904 /* en */,
- );
- name = AIRejoinGroupChatTopBar.xib;
- path = "Plugins/Dual Window Interface";
- sourceTree = "<group>";
- };
761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */ = {
isa = PBXVariantGroup;
children = (
@@ -12520,6 +12512,15 @@
name = ESPurpleGTalkAccountView.nib;
sourceTree = "<group>";
};
+ 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 765F5DC61635934400C57904 /* en */,
+ );
+ name = AIRejoinGroupChatTopBar.xib;
+ path = "Plugins/Dual Window Interface";
+ sourceTree = "<group>";
+ };
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
diff -r 01bd312edc85 -r 20f3250e7e6f ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Sun Sep 04 21:35:34 2016 +0200
+++ b/ChangeLogs/Changes.txt Sun Sep 04 22:54:53 2016 +0200
@@ -76,11 +76,14 @@
* "Text Clip Support" (#14081)
IRC
- * Added a placeholder "#adium" to the "join chat" window to make the requirement of a "#" for most channels more obvious. (#11861)
+ * Added a placeholder "#adium" to the „Join Group Chat…“ window to make the requirement of a "#" for most channels more obvious. (#11861)
Yahoo
* Fixed ampersands being encoded mistakenly when adding a link. (#13429)
+ Development
+ * Removed MySpace protocol.
+
Version 1.5.11 (XX/YY/ZZZZ)
* Google Talk now authenticates using OAuth2, making logging in simpler when using two-factor authentication and more secure. (#16161)
diff -r 01bd312edc85 -r 20f3250e7e6f Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Sun Sep 04 21:35:34 2016 +0200
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Sun Sep 04 22:54:53 2016 +0200
@@ -336,7 +336,7 @@
name = UnitTests;
productName = Test;
productReference = 7EA3B0440DD1153F002A18D1 /* Test.octest */;
- productType = "com.apple.product-type.bundle";
+ productType = "com.apple.product-type.bundle.ocunit-test";
};
7EB5500F0DDC80DB000DC0D6 /* LinkDriver */ = {
isa = PBXNativeTarget;
@@ -399,6 +399,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AH;
+ LastTestingUpgradeCheck = 0730;
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "The Adium Team";
};
diff -r 01bd312edc85 -r 20f3250e7e6f Plists/Info.plist
--- a/Plists/Info.plist Sun Sep 04 21:35:34 2016 +0200
+++ b/Plists/Info.plist Sun Sep 04 22:54:53 2016 +0200
@@ -441,16 +441,6 @@
<key>CFBundleURLIconFile</key>
<string>generic</string>
<key>CFBundleURLName</key>
- <string>MySpace Service URL</string>
- <key>CFBundleURLSchemes</key>
- <array>
- <string>msim</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleURLIconFile</key>
- <string>generic</string>
- <key>CFBundleURLName</key>
<string>IRC Service URL</string>
<key>CFBundleURLSchemes</key>
<array>
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/CBPurpleServicePlugin.m
--- a/Plugins/Purple Service/CBPurpleServicePlugin.m Sun Sep 04 21:35:34 2016 +0200
+++ b/Plugins/Purple Service/CBPurpleServicePlugin.m Sun Sep 04 22:54:53 2016 +0200
@@ -50,7 +50,6 @@
[ESIRCService registerService];
[AILiveJournalService registerService];
[ESMSNService 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.
*/
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleDefaultsMySpace.plist
--- a/Plugins/Purple Service/PurpleDefaultsMySpace.plist Sun Sep 04 21:35:34 2016 +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 Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>Connect Host</key>
- <string>im.myspace.akadns.net</string>
- <key>Connect Port</key>
- <integer>1863</integer>
-</dict>
-</plist>
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleMySpaceAccount.h
--- a/Plugins/Purple Service/PurpleMySpaceAccount.h Sun Sep 04 21:35:34 2016 +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 "CBPurpleAccount.h"
-
- at interface PurpleMySpaceAccount : CBPurpleAccount {
-
-}
-
- at end
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleMySpaceAccount.m
--- a/Plugins/Purple Service/PurpleMySpaceAccount.m Sun Sep 04 21:35:34 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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 "PurpleMySpaceAccount.h"
-#import <Adium/AIHTMLDecoder.h>
-
- at implementation PurpleMySpaceAccount
-
-- (const char*)protocolPlugin
-{
- return "prpl-myspace";
-}
-
-- (NSString *)connectionStringForStep:(NSInteger)step
-{
- switch (step) {
- case 0:
- return AILocalizedString(@"Connecting",nil);
- break;
- case 1:
- return AILocalizedString(@"Reading challenge", "Description of a step in the connection process for MySpace. This could be translated as something like 'Reading from server'.");
- break;
- case 2:
- return AILocalizedString(@"Logging in","Connection step");
- break;
- case 3:
- return AILocalizedString(@"Connected","Connection step");
- break;
- }
-
- return nil;
-}
-
-- (NSString *)encodedAttributedString:(NSAttributedString *)inAttributedString forListObject:(AIListObject *)inListObject
-{
- return [AIHTMLDecoder encodeHTML:inAttributedString
- headers:YES
- fontTags:YES
- includingColorTags:YES
- closeFontTags:YES
- styleTags:YES
- closeStyleTagsOnFontChange:YES
- encodeNonASCII:YES
- encodeSpaces:NO
- imagesPath:nil
- attachmentsAsText:YES
- onlyIncludeOutgoingImages:NO
- simpleTagsOnly:NO
- bodyBackground:NO
- allowJavascriptURLs:YES];
-}
-
- at end
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleMySpaceAccountViewController.h
--- a/Plugins/Purple Service/PurpleMySpaceAccountViewController.h Sun Sep 04 21:35:34 2016 +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 "PurpleAccountViewController.h"
-
- at interface PurpleMySpaceAccountViewController : PurpleAccountViewController {
-
-}
-
- at end
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleMySpaceAccountViewController.m
--- a/Plugins/Purple Service/PurpleMySpaceAccountViewController.m Sun Sep 04 21:35:34 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +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 "PurpleMySpaceAccountViewController.h"
-
-
- at implementation PurpleMySpaceAccountViewController
-
- at end
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleMySpaceService.h
--- a/Plugins/Purple Service/PurpleMySpaceService.h Sun Sep 04 21:35:34 2016 +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 PurpleMySpaceService : PurpleService {
-
-}
-
- at end
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleMySpaceService.m
--- a/Plugins/Purple Service/PurpleMySpaceService.m Sun Sep 04 21:35:34 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +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 "PurpleMySpaceService.h"
-#import "PurpleMySpaceAccount.h"
-#import "PurpleMySpaceAccountViewController.h"
-#import <Adium/AIStatusControllerProtocol.h>
-#import <AIUtilities/AIImageAdditions.h>
-
- at implementation PurpleMySpaceService
-
-//Account Creation
-- (Class)accountClass{
- return [PurpleMySpaceAccount class];
-}
-
-- (AIAccountViewController *)accountViewController{
- return [PurpleMySpaceAccountViewController accountViewController];
-}
-
-- (DCJoinChatViewController *)joinChatView{
- return nil;
-}
-
-//Service Description
-- (NSString *)serviceCodeUniqueID{
- return @"libpurple-MySpace";
-}
-- (NSString *)serviceID{
- return @"MySpace";
-}
-- (NSString *)serviceClass{
- return @"MySpace";
-}
-- (NSString *)shortDescription{
- return @"MySpace";
-}
-- (NSString *)longDescription{
- return @"MySpaceIM";
-}
-- (NSCharacterSet *)allowedCharacters{
- return [NSCharacterSet characterSetWithCharactersInString:@"+abcdefghijklmnopqrstuvwxyz0123456789 at ._-"];
-}
-- (NSUInteger)allowedLength{
- return 999;
-}
-- (BOOL)caseSensitive{
- return NO;
-}
-- (AIServiceImportance)serviceImportance{
- return AIServiceSecondary;
-}
-- (NSString *)userNameLabel{
- return AILocalizedString(@"Email", "Used as a label for a username specified by email address");
-}
-- (NSString *)contactUserNameLabel{
- return AILocalizedString(@"MySpace ID", "Label for the username for a MySpace contact");
-}
-- (NSURL *)serviceAccountSetupURL
-{
- return [NSURL URLWithString:AILocalizedString(@"https://www.myspace.com/signup", @"URL for MySpace signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
-}
-- (NSString *)accountSetupLabel
-{
- return AILocalizedString(@"Sign up for MySpace", @"Text for MySpace sign up button");
-}
-- (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];
-}
-
-/*!
- * @brief Default icon
- *
- * Service Icon packs should always include images for all the built-in Adium services. This method allows external
- * service plugins to specify an image which will be used when the service icon pack does not specify one. It will
- * also be useful if new services are added to Adium itself after a significant number of Service Icon packs exist
- * which do not yet have an image for this service. If the active Service Icon pack provides an image for this service,
- * this method will not be called.
- *
- * The service should _not_ cache this icon internally; multiple calls should return unique NSImage objects.
- *
- * @param iconType The AIServiceIconType of the icon to return. This specifies the desired size of the icon.
- * @return NSImage to use for this service by default
- */
-- (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType
-{
- //If we're going to do it this way, we've got to return the small icon for both AIServiceIconSmall and the AIServiceIconList icons.
- return [NSImage imageNamed:((iconType == AIServiceIconSmall || iconType == AIServiceIconList) ? @"MySpace-small" : @"MySpace-large")
- forClass:[self class] loadLazily:YES];
-}
-
-/*!
- * @brief Path for default icon
- *
- * For use in message views, this is the path to a default icon as described above.
- *
- * @param iconType The AIServiceIconType of the icon to return.
- * @return The path to the image, otherwise nil.
- */
-- (NSString *)pathForDefaultServiceIconOfType:(AIServiceIconType)iconType
-{
- if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
- return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"MySpace-small"];
- } else {
- return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"MySpace-large"];
- }
-}
-
- at end
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/PurpleServices.h
--- a/Plugins/Purple Service/PurpleServices.h Sun Sep 04 21:35:34 2016 +0200
+++ b/Plugins/Purple Service/PurpleServices.h Sun Sep 04 22:54:53 2016 +0200
@@ -25,7 +25,6 @@
#import "AILiveJournalService.h"
#import "ESJabberService.h"
#import "ESMeanwhileService.h"
-#import "PurpleMySpaceService.h"
#import "ESNovellService.h"
#import "ESMSNService.h"
#import "ESSimpleService.h"
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/ca.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/ca.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/cs.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/cs.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/da.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/da.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/de.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/de.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/el_GR.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/el_GR.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/en.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/en.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/en_AU.lproj/Localizable.strings
--- a/Plugins/Purple Service/Resources/en_AU.lproj/Localizable.strings Sun Sep 04 21:35:34 2016 +0200
+++ b/Plugins/Purple Service/Resources/en_AU.lproj/Localizable.strings Sun Sep 04 22:54:53 2016 +0200
@@ -298,9 +298,6 @@
/* No comment provided by engineer. */
"MSN Passport" = "MSN Passport";
-/* Label for the username for a MySpace contact */
-"MySpace ID" = "MySpace ID";
-
/* Name table column header for the service discovery browser */
"Name" = "Name";
@@ -355,9 +352,6 @@
/* No comment provided by engineer. */
"Re-request Authorization from %@" = "Re-request Authorisation from %@";
-/* Description of a step in the connection process for MySpace. This could be translated as something like 'Reading from server'. */
-"Reading challenge" = "Reading challenge";
-
/* Connection step */
"Reading data" = "Reading data";
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/en_GB.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/en_GB.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/es.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/es.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/fi.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/fi.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/fr.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/fr.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/fr_CA.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/fr_CA.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/hu.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/hu.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/is.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/is.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/it.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/it.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/ja.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/ja.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/nb.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/nb.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/nl.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/nl.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/pl.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/pl.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/pt.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/pt.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/pt_PT.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/pt_PT.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/ru.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/ru.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/sk_SK.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/sk_SK.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/sl.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/sl.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/sv.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/sv.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/tr.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/tr.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/uk.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/uk.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/zh_CN.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/zh_CN.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Plugins/Purple Service/Resources/zh_TW.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/zh_TW.lproj/Localizable.strings has changed
diff -r 01bd312edc85 -r 20f3250e7e6f Resources/Service Icons/Aqua.AdiumServiceIcons/Icons.plist
--- a/Resources/Service Icons/Aqua.AdiumServiceIcons/Icons.plist Sun Sep 04 21:35:34 2016 +0200
+++ b/Resources/Service Icons/Aqua.AdiumServiceIcons/Icons.plist Sun Sep 04 22:54:53 2016 +0200
@@ -28,8 +28,6 @@
<string>dotmac.png</string>
<key>MSN</key>
<string>msn.png</string>
- <key>MySpace</key>
- <string>myspace.png</string>
<key>Sametime</key>
<string>sametime.png</string>
<key>SIMPLE</key>
@@ -67,8 +65,6 @@
<string>dotmac-small.png</string>
<key>MSN</key>
<string>msn-small.png</string>
- <key>MySpace</key>
- <string>myspace-small.png</string>
<key>Sametime</key>
<string>sametime-small.png</string>
<key>SIMPLE</key>
@@ -106,8 +102,6 @@
<string>dotmac-small.png</string>
<key>MSN</key>
<string>msn-small.png</string>
- <key>MySpace</key>
- <string>myspace-small.png</string>
<key>QQ</key>
<string>qq-small.png</string>
<key>Sametime</key>
diff -r 01bd312edc85 -r 20f3250e7e6f Source/AIURLHandlerPlugin.m
--- a/Source/AIURLHandlerPlugin.m Sun Sep 04 21:35:34 2016 +0200
+++ b/Source/AIURLHandlerPlugin.m Sun Sep 04 22:54:53 2016 +0200
@@ -165,7 +165,6 @@
@"GTalk", @"gtalk",
@"MSN", @"msn",
@"IRC", @"irc",
- @"MySpace", @"msim",
nil];
}
More information about the commits
mailing list