From b0299a52863c7dd80825147cd54b867bc2e9e48b Mon Sep 17 00:00:00 2001 From: Evan Schoenberg Date: Fri, 14 Sep 2007 20:29:30 +0000 Subject: [PATCH] merged [20982]: Fixed capitilization of MySpace in all places, and enabled the MySpace service by initializing an instance of it in CBPurpleServicePlugin git-svn-id: svn://svn.adiumx.com/adium/branches/adium-1.1@20983 1c916fce-81e2-0310-a464-8ca513f45935 --- Plugins/Purple Service/CBPurpleServicePlugin.h | 1 + Plugins/Purple Service/CBPurpleServicePlugin.m | 2 ++ Plugins/Purple Service/PurpleMySpaceAccount.h | 4 ++-- Plugins/Purple Service/PurpleMySpaceAccount.m | 6 +++--- .../PurpleMySpaceAccountViewController.h | 4 ++-- .../PurpleMySpaceAccountViewController.m | 6 +++--- Plugins/Purple Service/PurpleMySpaceService.h | 4 ++-- Plugins/Purple Service/PurpleMySpaceService.m | 24 +++++++++++----------- Plugins/Purple Service/PurpleServices.h | 1 + 9 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Plugins/Purple Service/CBPurpleServicePlugin.h b/Plugins/Purple Service/CBPurpleServicePlugin.h index 1ad8b52a7..d34edbb3f 100644 --- a/Plugins/Purple Service/CBPurpleServicePlugin.h +++ b/Plugins/Purple Service/CBPurpleServicePlugin.h @@ -25,6 +25,7 @@ id LiveJournalService; id JabberService; id MeanwhileService; + id MySpaceService; id MSNService; id QQService; id SimpleService; diff --git a/Plugins/Purple Service/CBPurpleServicePlugin.m b/Plugins/Purple Service/CBPurpleServicePlugin.m index 0d8ff41f8..cf48bead1 100644 --- a/Plugins/Purple Service/CBPurpleServicePlugin.m +++ b/Plugins/Purple Service/CBPurpleServicePlugin.m @@ -44,6 +44,7 @@ GTalkService = [[AIGTalkService alloc] init]; LiveJournalService = [[AILiveJournalService alloc] init]; MSNService = [[ESMSNService alloc] init]; + MySpaceService = [[PurpleMySpaceService alloc] init]; QQService = [[ESQQService alloc] init]; SimpleService = [[ESSimpleService alloc] init]; NovellService = [[ESNovellService alloc] init]; @@ -70,6 +71,7 @@ [LiveJournalService release]; LiveJournalService = nil; [JabberService release]; JabberService = nil; [MSNService release]; MSNService = nil; + [MySpaceService release]; MySpaceService = nil; [SimpleService release]; SimpleService = nil; [QQService release]; QQService = nil; [YahooService release]; YahooService = nil; diff --git a/Plugins/Purple Service/PurpleMySpaceAccount.h b/Plugins/Purple Service/PurpleMySpaceAccount.h index d60ef59c7..c825d2f2e 100644 --- a/Plugins/Purple Service/PurpleMySpaceAccount.h +++ b/Plugins/Purple Service/PurpleMySpaceAccount.h @@ -1,5 +1,5 @@ // -// PurpleMyspaceAccount.h +// PurpleMySpaceAccount.h // Adium // // Created by Evan Schoenberg on 9/11/07. @@ -7,7 +7,7 @@ #import "CBPurpleAccount.h" -@interface PurpleMyspaceAccount : CBPurpleAccount { +@interface PurpleMySpaceAccount : CBPurpleAccount { } diff --git a/Plugins/Purple Service/PurpleMySpaceAccount.m b/Plugins/Purple Service/PurpleMySpaceAccount.m index 061ecf5c7..968269677 100644 --- a/Plugins/Purple Service/PurpleMySpaceAccount.m +++ b/Plugins/Purple Service/PurpleMySpaceAccount.m @@ -1,14 +1,14 @@ // -// PurpleMyspaceAccount.m +// PurpleMySpaceAccount.m // Adium // // Created by Evan Schoenberg on 9/11/07. // -#import "PurpleMyspaceAccount.h" +#import "PurpleMySpaceAccount.h" #import -@implementation PurpleMyspaceAccount +@implementation PurpleMySpaceAccount - (const char*)protocolPlugin { diff --git a/Plugins/Purple Service/PurpleMySpaceAccountViewController.h b/Plugins/Purple Service/PurpleMySpaceAccountViewController.h index 8036f6ac6..5a9b41be7 100644 --- a/Plugins/Purple Service/PurpleMySpaceAccountViewController.h +++ b/Plugins/Purple Service/PurpleMySpaceAccountViewController.h @@ -1,5 +1,5 @@ // -// PurpleMyspaceAccountViewController.h +// PurpleMySpaceAccountViewController.h // Adium // // Created by Evan Schoenberg on 9/11/07. @@ -7,7 +7,7 @@ #import "AIAccountViewController.h" -@interface PurpleMyspaceAccountViewController : AIAccountViewController { +@interface PurpleMySpaceAccountViewController : AIAccountViewController { } diff --git a/Plugins/Purple Service/PurpleMySpaceAccountViewController.m b/Plugins/Purple Service/PurpleMySpaceAccountViewController.m index a3bcbc9a6..dfbfb9695 100644 --- a/Plugins/Purple Service/PurpleMySpaceAccountViewController.m +++ b/Plugins/Purple Service/PurpleMySpaceAccountViewController.m @@ -1,13 +1,13 @@ // -// PurpleMyspaceAccountViewController.m +// PurpleMySpaceAccountViewController.m // Adium // // Created by Evan Schoenberg on 9/11/07. // -#import "PurpleMyspaceAccountViewController.h" +#import "PurpleMySpaceAccountViewController.h" -@implementation PurpleMyspaceAccountViewController +@implementation PurpleMySpaceAccountViewController @end diff --git a/Plugins/Purple Service/PurpleMySpaceService.h b/Plugins/Purple Service/PurpleMySpaceService.h index 1f0949344..368c68f6c 100644 --- a/Plugins/Purple Service/PurpleMySpaceService.h +++ b/Plugins/Purple Service/PurpleMySpaceService.h @@ -1,5 +1,5 @@ // -// PurpleMyspaceService.h +// PurpleMySpaceService.h // Adium // // Created by Evan Schoenberg on 9/11/07. @@ -7,7 +7,7 @@ #import "PurpleService.h" -@interface PurpleMyspaceService : PurpleService { +@interface PurpleMySpaceService : PurpleService { } diff --git a/Plugins/Purple Service/PurpleMySpaceService.m b/Plugins/Purple Service/PurpleMySpaceService.m index 891d46f09..ff43139df 100644 --- a/Plugins/Purple Service/PurpleMySpaceService.m +++ b/Plugins/Purple Service/PurpleMySpaceService.m @@ -1,25 +1,25 @@ // -// PurpleMyspaceService.m +// PurpleMySpaceService.m // Adium // // Created by Evan Schoenberg on 9/11/07. // -#import "PurpleMyspaceService.h" -#import "PurpleMyspaceAccount.h" -#import "PurpleMyspaceAccountViewController.h" +#import "PurpleMySpaceService.h" +#import "PurpleMySpaceAccount.h" +#import "PurpleMySpaceAccountViewController.h" #import #import -@implementation PurpleMyspaceService +@implementation PurpleMySpaceService //Account Creation - (Class)accountClass{ - return [PurpleMyspaceAccount class]; + return [PurpleMySpaceAccount class]; } - (AIAccountViewController *)accountViewController{ - return [PurpleMyspaceAccountViewController accountViewController]; + return [PurpleMySpaceAccountViewController accountViewController]; } - (DCJoinChatViewController *)joinChatView{ @@ -28,19 +28,19 @@ //Service Description - (NSString *)serviceCodeUniqueID{ - return @"libpurple-Myspace"; + return @"libpurple-MySpace"; } - (NSString *)serviceID{ - return @"Myspace"; + return @"MySpace"; } - (NSString *)serviceClass{ - return @"Myspace"; + return @"MySpace"; } - (NSString *)shortDescription{ - return @"Myspace"; + return @"MySpace"; } - (NSString *)longDescription{ - return @"MyspaceIM"; + return @"MySpaceIM"; } - (NSCharacterSet *)allowedCharacters{ return [NSCharacterSet characterSetWithCharactersInString:@"+abcdefghijklmnopqrstuvwxyz0123456789@._-"]; diff --git a/Plugins/Purple Service/PurpleServices.h b/Plugins/Purple Service/PurpleServices.h index 12141fae6..107439502 100644 --- a/Plugins/Purple Service/PurpleServices.h +++ b/Plugins/Purple Service/PurpleServices.h @@ -22,6 +22,7 @@ #import "AILiveJournalService.h" #import "ESJabberService.h" #import "ESMeanwhileService.h" +#import "PurpleMySpaceService.h" #import "ESNovellService.h" #import "ESMSNService.h" #import "ESSimpleService.h" -- 2.11.4.GIT