Adium

Changeset 13514

Show
Ignore:
Timestamp:
09/20/2005 04:19:32 PM (3 years ago)
Author:
boredzo
Message:

Committed the patch from Gayle Laakmann on #1306 (refs #1306), to add Google Talk as a separate service in Adium's 'New Account' pull-down menu button. I made these changes:

  • Changed project reference to GaimDefaultsGTalk.plist to refer to it in Plugins/Gaim\ Service.
  • Changed ESJabberAccount changes to not use stringWithFormat: (use stringByAppendingString: instead).
  • Changed use of NSLog to use of AILog (less annoying for the users, and a no-op in non-debug builds).
  • Use DEFAULT_JABBER_HOST in -[ESGaimJabberAccount serverSuffix].
  • Alphabetised GTalkService among the other services in CBGaimServicePlugin.
  • Improved alphabetisation of Icons.plist over the original patch.
  • Renamed new source-code files from ES... to AI....
  • Changed GTalk defaults plist from:
    • Connect Host: login.oscar.aol.com
    • Connect Port: 5190
    • ICQ:Encoding: ISO-8859-1

to:

  • Jabber:Connect Server: talk.google.com
  • Connect Port: 5222
  • Jabber:Resource: Adium

Fixes #1306.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/adium-0.8/Adium.xcodeproj/project.pbxproj

    r13406 r13514  
    4545                078C5CD3079EFF88004C75A4 /* AILocalizationButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 078C5CD1079EFF87004C75A4 /* AILocalizationButtonCell.m */; }; 
    4646                07AF3C5A07D4897300409BC8 /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 07AF3C5907D4897200409BC8 /* pref-messagehistory.png */; }; 
     47                07BE685808DD73B20029E08F /* AIGaimGTalkAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 07BE684F08DD73AF0029E08F /* AIGaimGTalkAccount.h */; }; 
     48                07BE685908DD73B20029E08F /* AIGaimGTalkAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 07BE685008DD73AF0029E08F /* AIGaimGTalkAccount.m */; }; 
     49                07BE685A08DD73B20029E08F /* AIGaimGTalkAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 07BE685108DD73AF0029E08F /* AIGaimGTalkAccountViewController.h */; }; 
     50                07BE685B08DD73B20029E08F /* AIGaimGTalkAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07BE685208DD73B00029E08F /* AIGaimGTalkAccountViewController.m */; }; 
     51                07BE685C08DD73B20029E08F /* AIGaimOscarAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 07BE685308DD73B00029E08F /* AIGaimOscarAccountViewController.h */; }; 
     52                07BE685E08DD73B20029E08F /* AIGTalkService.h in Headers */ = {isa = PBXBuildFile; fileRef = 07BE685508DD73B10029E08F /* AIGTalkService.h */; }; 
     53                07BE685F08DD73B20029E08F /* AIGTalkService.m in Sources */ = {isa = PBXBuildFile; fileRef = 07BE685608DD73B10029E08F /* AIGTalkService.m */; }; 
     54                07BE686008DD73B20029E08F /* GaimDefaultsGTalk.plist in Resources */ = {isa = PBXBuildFile; fileRef = 07BE685708DD73B10029E08F /* GaimDefaultsGTalk.plist */; }; 
    4755                3402D5A5080DBC91004E50B4 /* SortConfiguration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E791D07CAA52300350507 /* SortConfiguration.nib */; }; 
    4856                3402E01B07CB0CED0044F818 /* ESFileTransferProgressView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3402E01A07CB0CEC0044F818 /* ESFileTransferProgressView.nib */; }; 
    …… 
    16031611                078C5CD1079EFF87004C75A4 /* AILocalizationButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILocalizationButtonCell.m; path = "Frameworks/Adium Framework/AILocalizationButtonCell.m"; sourceTree = "<group>"; }; 
    16041612                07AF3C5907D4897200409BC8 /* pref-messagehistory.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagehistory.png"; path = "Resources/pref-messagehistory.png"; sourceTree = "<group>"; }; 
     1613                07BE684F08DD73AF0029E08F /* AIGaimGTalkAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGaimGTalkAccount.h; path = "Plugins/Gaim Service/AIGaimGTalkAccount.h"; sourceTree = "<group>"; }; 
     1614                07BE685008DD73AF0029E08F /* AIGaimGTalkAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGaimGTalkAccount.m; path = "Plugins/Gaim Service/AIGaimGTalkAccount.m"; sourceTree = "<group>"; }; 
     1615                07BE685108DD73AF0029E08F /* AIGaimGTalkAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGaimGTalkAccountViewController.h; path = "Plugins/Gaim Service/AIGaimGTalkAccountViewController.h"; sourceTree = "<group>"; }; 
     1616                07BE685208DD73B00029E08F /* AIGaimGTalkAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGaimGTalkAccountViewController.m; path = "Plugins/Gaim Service/AIGaimGTalkAccountViewController.m"; sourceTree = "<group>"; }; 
     1617                07BE685308DD73B00029E08F /* AIGaimOscarAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGaimOscarAccountViewController.h; path = "Plugins/Gaim Service/AIGaimOscarAccountViewController.h"; sourceTree = "<group>"; }; 
     1618                07BE685408DD73B10029E08F /* AIGaimOscarAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGaimOscarAccountViewController.m; path = "Plugins/Gaim Service/AIGaimOscarAccountViewController.m"; sourceTree = "<group>"; }; 
     1619                07BE685508DD73B10029E08F /* AIGTalkService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGTalkService.h; path = "Plugins/Gaim Service/AIGTalkService.h"; sourceTree = "<group>"; }; 
     1620                07BE685608DD73B10029E08F /* AIGTalkService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGTalkService.m; path = "Plugins/Gaim Service/AIGTalkService.m"; sourceTree = "<group>"; }; 
     1621                07BE685708DD73B10029E08F /* GaimDefaultsGTalk.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = GaimDefaultsGTalk.plist; path = "Plugins/Gaim Service/GaimDefaultsGTalk.plist"; sourceTree = "<group>"; }; 
    16051622                11C157D804A88E04008E0C76 /* AIEmoticonController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIEmoticonController.h; path = Plugins/Emoticons/AIEmoticonController.h; sourceTree = "<group>"; }; 
    16061623                11C157D904A88E04008E0C76 /* AIEmoticonController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIEmoticonController.m; path = Plugins/Emoticons/AIEmoticonController.m; sourceTree = "<group>"; }; 
    …… 
    33353352                        sourceTree = "<group>"; 
    33363353                }; 
     3354                07BE686208DD73D50029E08F /* Google Talk */ = { 
     3355                        isa = PBXGroup; 
     3356                        children = ( 
     3357                                07BE684F08DD73AF0029E08F /* AIGaimGTalkAccount.h */, 
     3358                                07BE685008DD73AF0029E08F /* AIGaimGTalkAccount.m */, 
     3359                                07BE685108DD73AF0029E08F /* AIGaimGTalkAccountViewController.h */, 
     3360                                07BE685208DD73B00029E08F /* AIGaimGTalkAccountViewController.m */, 
     3361                                07BE685308DD73B00029E08F /* AIGaimOscarAccountViewController.h */, 
     3362                                07BE685408DD73B10029E08F /* AIGaimOscarAccountViewController.m */, 
     3363                                07BE685508DD73B10029E08F /* AIGTalkService.h */, 
     3364                                07BE685608DD73B10029E08F /* AIGTalkService.m */, 
     3365                                07BE685708DD73B10029E08F /* GaimDefaultsGTalk.plist */, 
     3366                        ); 
     3367                        name = "Google Talk"; 
     3368                        sourceTree = "<group>"; 
     3369                }; 
    33373370                11C157D504A88DE0008E0C76 /* Emoticons */ = { 
    33383371                        isa = PBXGroup; 
    …… 
    36503683                                4BB19298079EE90900DAA523 /* GaimDefaultsJabber.plist */, 
    36513684                                349FF9FF0750752100E36B3B /* Antepo */, 
     3685                                07BE686208DD73D50029E08F /* Google Talk */, 
    36523686                        ); 
    36533687                        name = Jabber; 
    …… 
    64616495                                346524BD08373908009565FE /* ESGaimOTRFingerprintDetailsWindowController.h in Headers */, 
    64626496                                346AF24008447C3100533D0C /* ESGaimAuthorizationRequestWindowController.h in Headers */, 
     6497                                07BE685808DD73B20029E08F /* AIGaimGTalkAccount.h in Headers */, 
     6498                                07BE685A08DD73B20029E08F /* AIGaimGTalkAccountViewController.h in Headers */, 
     6499                                07BE685C08DD73B20029E08F /* AIGaimOscarAccountViewController.h in Headers */, 
     6500                                07BE685E08DD73B20029E08F /* AIGTalkService.h in Headers */, 
    64636501                        ); 
    64646502                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    75867624                                346524C7083739F2009565FE /* GaimOTRFingerprintDetailsWindow.nib in Resources */, 
    75877625                                346AF24208447C3100533D0C /* GaimAuthorizationRequestWindow.nib in Resources */, 
     7626                                07BE686008DD73B20029E08F /* GaimDefaultsGTalk.plist in Resources */, 
    75887627                        ); 
    75897628                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    82158254                                346524BC08373908009565FE /* ESGaimOTRFingerprintDetailsWindowController.m in Sources */, 
    82168255                                346AF24108447C3100533D0C /* ESGaimAuthorizationRequestWindowController.m in Sources */, 
     8256                                07BE685908DD73B20029E08F /* AIGaimGTalkAccount.m in Sources */, 
     8257                                07BE685B08DD73B20029E08F /* AIGaimGTalkAccountViewController.m in Sources */, 
     8258                                07BE685F08DD73B20029E08F /* AIGTalkService.m in Sources */, 
    82178259                        ); 
    82188260                        runOnlyForDeploymentPostprocessing = 0; 

  • branches/adium-0.8/Plugins/Gaim Service/Catalan.lproj/Localizable.strings

    r13186 r13514  
    320320"username@jabber.org" = "usuari@jabber.org"; 
    321321 
     322/* Sample name and server for new gmail accounts */ 
     323"username@gmail.com" = "usuari@gmail.com"; 
     324 
    322325/* No comment provided by engineer. */ 
    323326"Warning level is too high." = "El nivell d'alertes és massa alt."; 

  • branches/adium-0.8/Plugins/Gaim Service/CBGaimServicePlugin.h

    r10919 r13514  
    2323    id  DotMacService; 
    2424        id  GaduGaduService; 
     25        id  GTalkService; 
    2526    id  JabberService; 
    2627        id  MeanwhileService; 

  • branches/adium-0.8/Plugins/Gaim Service/CBGaimServicePlugin.m

    r11051 r13514  
    4545        DotMacService           = [[ESDotMacService alloc] init]; 
    4646        GaduGaduService         = [[ESGaduGaduService alloc] init]; 
     47        GTalkService            = [[AIGTalkService alloc] init]; 
    4748        MSNService                      = [[ESMSNService alloc] init]; 
    4849        NovellService           = [[ESNovellService alloc] init]; 
    …… 
    6869        [DotMacService release]; DotMacService = nil; 
    6970        [GaduGaduService release]; GaduGaduService = nil; 
     71        [GTalkService release]; GTalkService = nil; 
    7072        [JabberService release]; JabberService = nil; 
    7173        [MSNService release]; MSNService = nil; 

  • branches/adium-0.8/Plugins/Gaim Service/cs.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "uzivatelskejmeno@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "uzivatelskejmeno@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Úroveň výstrahy je příliš vysoká."; 

  • branches/adium-0.8/Plugins/Gaim Service/Danish.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "username@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "username@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Advarsels niveau er for højt."; 

  • branches/adium-0.8/Plugins/Gaim Service/Dutch.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "username@jabber.org"; 
    320320 
     321/* Sample name and server for new GMail accounts */ 
     322"username@gmail.com" = "username@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Waarschuwingsniveau is te hoog."; 

  • branches/adium-0.8/Plugins/Gaim Service/ESGaimJabberAccount.h

    r10724 r13514  
    2727} 
    2828 
     29- (NSString *) serverSuffix; 
     30 
    2931@end 

  • branches/adium-0.8/Plugins/Gaim Service/ESGaimJabberAccount.m

    r13406 r13514  
    3131#include <Libgaim/si.h> 
    3232 
    33 #define DEFAULT_JABBER_HOST @"jabber.org" 
     33#define DEFAULT_JABBER_HOST @"@jabber.org" 
    3434 
    3535@implementation ESGaimJabberAccount 
    …… 
    7171                }else{ 
    7272                        //Append @jabber.org to a Jabber account with no server 
    73                         correctUID = [NSString stringWithFormat:@"%@@jabber.org",proposedUID];                  
     73                        correctUID = [proposedUID stringByAppendingString:[self serverSuffix]]; 
    7474                } 
    7575        }else{ 
    …… 
    129129        allowPlaintext = [[self preferenceForKey:KEY_JABBER_ALLOW_PLAINTEXT group:GROUP_ACCOUNT_STATUS] boolValue]; 
    130130        gaim_account_set_bool(account, "auth_plain_in_clear", allowPlaintext); 
     131} 
     132 
     133- (NSString *) serverSuffix 
     134{ 
     135        AILog(@"using jabber"); 
     136        return DEFAULT_JABBER_HOST; 
    131137} 
    132138 
    …… 
    149155                userNameWithHost = UID; 
    150156        }else{ 
    151                 userNameWithHost = [NSString stringWithFormat:@"%@@jabber.org",UID]; 
     157                userNameWithHost = [UID stringByAppendingString:[self serverSuffix]]; 
    152158        } 
    153159 
    …… 
    186192 
    187193                } else { 
    188                         host = DEFAULT_JABBER_HOST; 
     194                        host = [self serverSuffix]; 
    189195                } 
    190196        } 

  • branches/adium-0.8/Plugins/Gaim Service/French.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "nomdutilisateur@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "nomdutilisateur@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Niveau d'alerte trop élevé."; 

  • branches/adium-0.8/Plugins/Gaim Service/GaimServices.h

    r10034 r13514  
    2020#import "ESDotMacService.h" 
    2121#import "ESGaduGaduService.h" 
     22#import "AIGTalkService.h" 
    2223#import "ESJabberService.h" 
    2324#import "ESMeanwhileService.h" 

  • branches/adium-0.8/Plugins/Gaim Service/German.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "nutzername@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "nutzername@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Warnstufe ist zu hoch."; 

  • branches/adium-0.8/Plugins/Gaim Service/is.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "notandanafn@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "notandanafn@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Viðvörunarstig er of hátt."; 

  • branches/adium-0.8/Plugins/Gaim Service/Italian.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "nomeutente@jabber.org"; 
    320320 
     321/* Sample name and server for new GMail accounts */ 
     322"username@gmail.com" = "nomeutente@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Il livello di avvertimento è troppo alto."; 

  • branches/adium-0.8/Plugins/Gaim Service/Japanese.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "username@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "username@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "警告レベルが高すぎます。"; 

  • branches/adium-0.8/Plugins/Gaim Service/Norwegian.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "brukernavn@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "brukernavn@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Advarselsnivået er for høyt."; 

  • branches/adium-0.8/Plugins/Gaim Service/Russian.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "username@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "username@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "Уровень опасности слишком высок."; 

  • branches/adium-0.8/Plugins/Gaim Service/Swedish.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "anvandarnamn@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "anvandarnamn@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "För hög varningsnivå."; 

  • branches/adium-0.8/Plugins/Gaim Service/zh_CN.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "用户名@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "用户名@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "警告级别太高。"; 

  • branches/adium-0.8/Plugins/Gaim Service/zh_TW.lproj/Localizable.strings

    r13168 r13514  
    319319"username@jabber.org" = "username@jabber.org"; 
    320320 
     321/* Sample name and server for new gmail accounts */ 
     322"username@gmail.com" = "username@gmail.com"; 
     323 
    321324/* No comment provided by engineer. */ 
    322325"Warning level is too high." = "警告層級太高。"; 

  • branches/adium-0.8/Resources/Service Icons/Aqua.AdiumServiceIcons/Icons.plist

    r11348 r13514  
    99                <key>AIM</key> 
    1010                <string>aim.png</string> 
     11                <key>Bonjour</key> 
     12                <string>bonjour.png</string> 
    1113                <key>Gadu-Gadu</key> 
    1214                <string>gadu-gadu.png</string> 
    13                 <key>Mac</key> 
    14                 <string>dotmac.png</string> 
     15                <key>GroupWise</key> 
     16                <string>groupwise.png</string> 
     17                <key>GTalk</key> 
     18                <string>gtalk.png</string> 
    1519                <key>ICQ</key> 
    1620                <string>icq.png</string> 
    1721                <key>Jabber</key> 
    1822                <string>jabber.png</string> 
    19                 <key>Sametime</key> 
    20                 <string>sametime.png</string> 
     23                <key>Mac</key> 
     24                <string>dotmac.png</string> 
    2125                <key>MSN</key> 
    2226                <string>msn.png</string> 
    2327                <key>Napster</key> 
    2428                <string>napster.png</string> 
    25                 <key>GroupWise</key> 
    26                 <string>groupwise.png</string> 
     29                <key>Sametime</key> 
     30                <string>sametime.png</string> 
     31                <key>Stress Test</key> 
     32                <string>yahoo.png</string> 
     33                <key>Trepia</key> 
     34                <string>trepia.png</string> 
    2735                <key>Yahoo!</key> 
    2836                <string>yahoo.png</string> 
    …… 
    3139                <key>Zephyr</key> 
    3240                <string>zephyr.png</string> 
    33                 <key>Trepia</key> 
    34                 <string>trepia.png</string> 
    35                 <key>Bonjour</key> 
    36                 <string>bonjour.png</string> 
    37                 <key>Stress Test</key> 
    38                 <string>yahoo.png</string> 
    3941        </dict> 
    4042        <key>Interface-Small</key> 
    …… 
    4244                <key>AIM</key> 
    4345                <string>aim-small.png</string> 
     46                <key>Bonjour</key> 
     47                <string>bonjour-small.png</string> 
    4448                <key>Gadu-Gadu</key> 
    4549                <string>gadu-gadu-small.png</string> 
    46                 <key>Mac</key> 
    47                 <string>dotmac-small.png</string> 
     50                <key>GroupWise</key> 
     51                <string>groupwise-small.png</string> 
     52                <key>GTalk</key> 
     53                <string>gtalk-small.png</string> 
    4854                <key>ICQ</key> 
    4955                <string>icq-small.png</string> 
    5056                <key>Jabber</key> 
    5157                <string>jabber-small.png</string> 
    52                 <key>Sametime</key> 
    53                 <string>sametime-small.png</string> 
     58                <key>Mac</key> 
     59                <string>dotmac-small.png</string> 
    5460                <key>MSN</key> 
    5561                <string>msn-small.png</string> 
    5662                <key>Napster</key> 
    5763                <string>napster-small.png</string> 
    58                 <key>GroupWise</key> 
    59                 <string>groupwise-small.png</string> 
     64                <key>Sametime</key> 
     65                <string>sametime-small.png</string> 
     66                <key>Stress Test</key> 
     67                <string>yahoo-small.png</string> 
     68                <key>Trepia</key> 
     69                <string>trepia-small.png</string> 
    6070                <key>Yahoo!</key> 
    6171                <string>yahoo-small.png</string> 
    …… 
    6474                <key>Zephyr</key> 
    6575                <string>zephyr-small.png</string> 
    66                 <key>Trepia</key> 
    67                 <string>trepia-small.png</string> 
    68                 <key>Bonjour</key> 
    69                 <string>bonjour-small.png</string> 
    70                 <key>Stress Test</key> 
    71                 <string>yahoo-small.png</string> 
    7276        </dict> 
    7377        <key>List</key> 
    …… 
    7579                <key>AIM</key> 
    7680                <string>aim-small.png</string> 
     81                <key>Bonjour</key> 
     82                <string>bonjour-small.png</string> 
    7783                <key>Gadu-Gadu</key> 
    7884                <string>gadu-gadu-small.png</string> 
    79                 <key>Mac</key> 
    80                 <string>dotmac-small.png</string> 
     85                <key>GroupWise</key> 
     86                <string>groupwise-small.png</string> 
     87                <key>GTalk</key> 
     88                <string>gtalk-small.png</string> 
    8189                <key>ICQ</key> 
    8290                <string>icq-small.png</string> 
    8391                <key>Jabber</key> 
    8492                <string>jabber-small.png</string> 
    85                 <key>Sametime</key> 
    86                 <string>sametime-small.png</string> 
     93                <key>Mac</key> 
     94                <string>dotmac-small.png</string> 
    8795                <key>MSN</key> 
    8896                <string>msn-small.png</string> 
    8997                <key>Napster</key> 
    9098                <string>napster-small.png</string> 
    91                 <key>GroupWise</key> 
    92                 <string>groupwise-small.png</string> 
     99                <key>Sametime</key> 
     100                <string>sametime-small.png</string> 
     101                <key>Stress Test</key> 
     102                <string>yahoo-small.png</string> 
     103                <key>Trepia</key> 
     104                <string>trepia-small.png</string> 
    93105                <key>Yahoo!</key> 
    94106                <string>yahoo-small.png</string> 
    …… 
    97109                <key>Zephyr</key> 
    98110                <string>zephyr-small.png</string> 
    99                 <key>Trepia</key> 
    100                 <string>trepia-small.png</string> 
    101                 <key>Bonjour</key> 
    102                 <string>bonjour-small.png</string> 
    103                 <key>Stress Test</key> 
    104                 <string>yahoo-small.png</string> 
    105111        </dict> 
    106112</dict>