Adium

Changeset 25583 for branches

Show
Ignore:
Timestamp:
11/13/2008 11:44:06 PM (2 months ago)
Author:
catfish_man
Message:

Merge OldListXtras removal

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/adium-1.3/Adium.xcodeproj

    • Property svn:mergeinfo changed from /trunk/Adium.xcodeproj:1-21432,21434-21479,24736,24741-24743,24886-24887,24894,24896,24909,24912,24914,24916,24954,24957,24968,25016,25026,25044,25047-25048,25094,25096,25100,25114,25116-25117,25140,25143,25154,25165,25167,25185-25187,25209-25210,25216,25219,25224,25227,25262,25397,25400,25471 to /trunk/Adium.xcodeproj:1-21432,21434-21479,24736,24741-24743,24886-24887,24894,24896,24909,24912,24914,24916,24954,24957,24968,25016,25026,25044,25047-25048,25094,25096,25100,25114,25116-25117,25140,25143,25154,25165,25167,25185-25187,25209-25210,25216,25219,25224,25227,25262,25397,25400,25471,25581

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

    r25541 r25583  
    12021202                6360B25A0BF2EB93004CD99B /* AIWebKitDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B2590BF2EB93004CD99B /* AIWebKitDelegate.m */; }; 
    12031203                638392F809D4D67A0067B9B7 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 638392F609D4D67A0067B9B7 /* Sparkle.framework */; }; 
    1204                 63AF931A0AA81E2300B88299 /* Bright Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91C90AA8102600B88299 /* Bright Blue.ListTheme */; }; 
    1205                 63AF931B0AA81E2300B88299 /* Bright Green.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CA0AA8102600B88299 /* Bright Green.ListTheme */; }; 
    1206                 63AF931D0AA81E2300B88299 /* Bright Pink.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CC0AA8102600B88299 /* Bright Pink.ListTheme */; }; 
    1207                 63AF931E0AA81E2300B88299 /* Large (iChat).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CD0AA8102700B88299 /* Large (iChat).ListLayout */; }; 
    1208                 63AF931F0AA81E2300B88299 /* Large (with service icons).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CE0AA8102700B88299 /* Large (with service icons).ListLayout */; }; 
    1209                 63AF93200AA81E2300B88299 /* Large.ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CF0AA8102700B88299 /* Large.ListLayout */; }; 
    1210                 63AF93210AA81E2300B88299 /* Normal (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D00AA8102700B88299 /* Normal (with user icons).ListLayout */; }; 
    1211                 63AF93220AA81E2300B88299 /* Normal.ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D10AA8102700B88299 /* Normal.ListLayout */; }; 
    1212                 63AF93230AA81E2300B88299 /* Pastel Blue (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D20AA8102800B88299 /* Pastel Blue (White on Black).ListTheme */; }; 
    1213                 63AF93240AA81E2300B88299 /* Pastel Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D30AA8102800B88299 /* Pastel Blue.ListTheme */; }; 
    1214                 63AF93250AA81E2300B88299 /* Pastel Gray (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D40AA8102800B88299 /* Pastel Gray (White on Black).ListTheme */; }; 
    1215                 63AF93260AA81E2300B88299 /* Pastel Gray.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D50AA8102800B88299 /* Pastel Gray.ListTheme */; }; 
    1216                 63AF93270AA81E2300B88299 /* Pastel Green (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D60AA8102800B88299 /* Pastel Green (White on Black).ListTheme */; }; 
    1217                 63AF93280AA81E2300B88299 /* Pastel Green.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D70AA8102800B88299 /* Pastel Green.ListTheme */; }; 
    1218                 63AF93290AA81E2300B88299 /* Pastel Pink (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D80AA8102900B88299 /* Pastel Pink (White on Black).ListTheme */; }; 
    1219                 63AF932B0AA81E2300B88299 /* Pure Black.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DA0AA8102900B88299 /* Pure Black.ListTheme */; }; 
    1220                 63AF932C0AA81E2300B88299 /* Pure White.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DB0AA8102900B88299 /* Pure White.ListTheme */; }; 
    1221                 63AF932D0AA81E2300B88299 /* Tiny (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DC0AA8102900B88299 /* Tiny (with user icons).ListLayout */; }; 
    1222                 63AF932E0AA81E2300B88299 /* Tiny.ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DD0AA8102A00B88299 /* Tiny.ListLayout */; }; 
    12231204                63C120750910A0DD00C9DB57 /* DefaultXtraReadme.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 63C120740910A0DD00C9DB57 /* DefaultXtraReadme.rtf */; }; 
    12241205                63DEB89009BD3FEC0026DC69 /* AIXtraPreviewImageController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63DEB88E09BD3FEC0026DC69 /* AIXtraPreviewImageController.m */; }; 
    …… 
    17941775                        dstSubfolderSpec = 7; 
    17951776                        files = ( 
    1796                                 63AF931A0AA81E2300B88299 /* Bright Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1797                                 63AF931B0AA81E2300B88299 /* Bright Green.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1798                                 63AF931D0AA81E2300B88299 /* Bright Pink.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1799                                 63AF931E0AA81E2300B88299 /* Large (iChat).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1800                                 63AF931F0AA81E2300B88299 /* Large (with service icons).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1801                                 63AF93200AA81E2300B88299 /* Large.ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1802                                 63AF93210AA81E2300B88299 /* Normal (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1803                                 63AF93220AA81E2300B88299 /* Normal.ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1804                                 63AF93230AA81E2300B88299 /* Pastel Blue (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1805                                 63AF93240AA81E2300B88299 /* Pastel Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1806                                 63AF93250AA81E2300B88299 /* Pastel Gray (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1807                                 63AF93260AA81E2300B88299 /* Pastel Gray.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1808                                 63AF93270AA81E2300B88299 /* Pastel Green (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1809                                 63AF93280AA81E2300B88299 /* Pastel Green.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1810                                 63AF93290AA81E2300B88299 /* Pastel Pink (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1811                                 63AF932B0AA81E2300B88299 /* Pure Black.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1812                                 63AF932C0AA81E2300B88299 /* Pure White.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1813                                 63AF932D0AA81E2300B88299 /* Tiny (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1814                                 63AF932E0AA81E2300B88299 /* Tiny.ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    18151777                        ); 
    18161778                        name = "Copy Legacy ListThemes and ListLayouts"; 
    …… 
    41424104                636AB7F2087E2B6700A87670 /* AIDockBadger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIDockBadger.m; sourceTree = "<group>"; }; 
    41434105                638392F609D4D67A0067B9B7 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; }; 
    4144                 63AF91C90AA8102600B88299 /* Bright Blue.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Bright Blue.ListTheme"; sourceTree = "<group>"; }; 
    4145                 63AF91CA0AA8102600B88299 /* Bright Green.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Bright Green.ListTheme"; sourceTree = "<group>"; }; 
    4146                 63AF91CC0AA8102600B88299 /* Bright Pink.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Bright Pink.ListTheme"; sourceTree = "<group>"; }; 
    4147                 63AF91CD0AA8102700B88299 /* Large (iChat).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Large (iChat).ListLayout"; sourceTree = "<group>"; }; 
    4148                 63AF91CE0AA8102700B88299 /* Large (with service icons).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Large (with service icons).ListLayout"; sourceTree = "<group>"; }; 
    4149                 63AF91CF0AA8102700B88299 /* Large.ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Large.ListLayout; sourceTree = "<group>"; }; 
    4150                 63AF91D00AA8102700B88299 /* Normal (with user icons).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Normal (with user icons).ListLayout"; sourceTree = "<group>"; }; 
    4151                 63AF91D10AA8102700B88299 /* Normal.ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Normal.ListLayout; sourceTree = "<group>"; }; 
    4152                 63AF91D20AA8102800B88299 /* Pastel Blue (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Blue (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4153                 63AF91D30AA8102800B88299 /* Pastel Blue.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Blue.ListTheme"; sourceTree = "<group>"; }; 
    4154                 63AF91D40AA8102800B88299 /* Pastel Gray (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Gray (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4155                 63AF91D50AA8102800B88299 /* Pastel Gray.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Gray.ListTheme"; sourceTree = "<group>"; }; 
    4156                 63AF91D60AA8102800B88299 /* Pastel Green (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Green (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4157                 63AF91D70AA8102800B88299 /* Pastel Green.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Green.ListTheme"; sourceTree = "<group>"; }; 
    4158                 63AF91D80AA8102900B88299 /* Pastel Pink (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Pink (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4159                 63AF91DA0AA8102900B88299 /* Pure Black.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pure Black.ListTheme"; sourceTree = "<group>"; }; 
    4160                 63AF91DB0AA8102900B88299 /* Pure White.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pure White.ListTheme"; sourceTree = "<group>"; }; 
    4161                 63AF91DC0AA8102900B88299 /* Tiny (with user icons).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Tiny (with user icons).ListLayout"; sourceTree = "<group>"; }; 
    4162                 63AF91DD0AA8102A00B88299 /* Tiny.ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Tiny.ListLayout; sourceTree = "<group>"; }; 
    41634106                63C120740910A0DD00C9DB57 /* DefaultXtraReadme.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = DefaultXtraReadme.rtf; path = Resources/DefaultXtraReadme.rtf; sourceTree = "<group>"; }; 
    41644107                63DEB88D09BD3FEC0026DC69 /* AIXtraPreviewImageController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIXtraPreviewImageController.h; path = Source/AIXtraPreviewImageController.h; sourceTree = "<group>"; }; 
    …… 
    72497192                        sourceTree = "<group>"; 
    72507193                }; 
    7251                 63AF91C80AA80FE300B88299 /* OldListXtras */ = { 
    7252                         isa = PBXGroup; 
    7253                         children = ( 
    7254                                 63AF91C90AA8102600B88299 /* Bright Blue.ListTheme */, 
    7255                                 63AF91CA0AA8102600B88299 /* Bright Green.ListTheme */, 
    7256                                 63AF91CC0AA8102600B88299 /* Bright Pink.ListTheme */, 
    7257                                 63AF91CD0AA8102700B88299 /* Large (iChat).ListLayout */, 
    7258                                 63AF91CE0AA8102700B88299 /* Large (with service icons).ListLayout */, 
    7259                                 63AF91CF0AA8102700B88299 /* Large.ListLayout */, 
    7260                                 63AF91D00AA8102700B88299 /* Normal (with user icons).ListLayout */, 
    7261                                 63AF91D10AA8102700B88299 /* Normal.ListLayout */, 
    7262                                 63AF91D20AA8102800B88299 /* Pastel Blue (White on Black).ListTheme */, 
    7263                                 63AF91D30AA8102800B88299 /* Pastel Blue.ListTheme */, 
    7264                                 63AF91D40AA8102800B88299 /* Pastel Gray (White on Black).ListTheme */, 
    7265                                 63AF91D50AA8102800B88299 /* Pastel Gray.ListTheme */, 
    7266                                 63AF91D60AA8102800B88299 /* Pastel Green (White on Black).ListTheme */, 
    7267                                 63AF91D70AA8102800B88299 /* Pastel Green.ListTheme */, 
    7268                                 63AF91D80AA8102900B88299 /* Pastel Pink (White on Black).ListTheme */, 
    7269                                 63AF91DA0AA8102900B88299 /* Pure Black.ListTheme */, 
    7270                                 63AF91DB0AA8102900B88299 /* Pure White.ListTheme */, 
    7271                                 63AF91DC0AA8102900B88299 /* Tiny (with user icons).ListLayout */, 
    7272                                 63AF91DD0AA8102A00B88299 /* Tiny.ListLayout */, 
    7273                         ); 
    7274                         name = OldListXtras; 
    7275                         path = Resources/OldListXtras; 
    7276                         sourceTree = "<group>"; 
    7277                 }; 
    72787194                661561620D84AEB0004B7946 /* Contact Hiding */ = { 
    72797195                        isa = PBXGroup; 
    …… 
    77127628                                F59DB6AD033EB74801A8010A /* main.m */, 
    77137629                                34575E3807CBA88E004A4FFF /* MainMenu.nib */, 
    7714                                 63AF91C80AA80FE300B88299 /* OldListXtras */, 
    77157630                                4B191D890611C10800E8A4E7 /* ReadMe.rtf */, 
    77167631                                34D8326307CBD598006466F2 /* sendfile.png */, 

  • branches/adium-1.3/Source

    • Property svn:mergeinfo changed from /trunk/Source:1-21432,21434-21479,24736,24741-24743,24886-24887,24894,24896,24909,24912,24914,24916,24954,24957,24988,25016,25019,25026,25044,25047-25048,25052,25094,25096,25100,25102,25114,25116-25117,25140,25143,25154,25165,25167,25185-25187,25209-25210,25216,25219,25224,25227,25262,25397,25400,25471 to /trunk/Source:1-21432,21434-21479,24736,24741-24743,24886-24887,24894,24896,24909,24912,24914,24916,24954,24957,24988,25016,25019,25026,25044,25047-25048,25052,25094,25096,25100,25102,25114,25116-25117,25140,25143,25154,25165,25167,25185-25187,25209-25210,25216,25219,25224,25227,25262,25397,25400,25471,25581

  • branches/adium-1.3/Source/AIAdium.m

    r24464 r25583  
    258258        [preferenceController controllerDidLoad]; 
    259259        [debugController controllerDidLoad]; 
    260         //Safety for when we remove previously included list xtras 
    261         [AIAppearancePreferences migrateOldListSettingsIfNeeded]; 
    262260        [pool release]; 
    263261 

  • branches/adium-1.3/Source/AIAppearancePreferences.m

    r24446 r25583  
    3737#import <AIMenuBarIcons.h> 
    3838 
    39 #define OLD_LIST_SETTINGS_PATH [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"OldListXtras"] 
    4039 
    4140typedef enum { 
    …… 
    482481#pragma mark Contact list layout & theme 
    483482 
    484 + (void) migrateOldListSettingsIfNeeded 
    485 { 
    486         id<AIPreferenceController> prefController = [adium preferenceController]; 
    487         NSFileManager *manager = [NSFileManager defaultManager]; 
    488         NSString *theme = [NSString stringWithFormat:@"%@/%@/%@.%@",  
    489                                                         [[NSBundle mainBundle] resourcePath],  
    490                                                         LIST_THEME_FOLDER, 
    491                                                         [prefController preferenceForKey:KEY_LIST_THEME_NAME group:PREF_GROUP_APPEARANCE], 
    492                                                         LIST_THEME_EXTENSION]; 
    493         if(![manager fileExistsAtPath:theme]) 
    494         { 
    495                 NSString *oldTheme = [OLD_LIST_SETTINGS_PATH stringByAppendingPathComponent:[theme lastPathComponent]]; 
    496                 if([manager fileExistsAtPath:oldTheme]) 
    497                         [manager movePath:oldTheme toPath:theme handler:nil]; 
    498         } 
    499         NSString *layout = [NSString stringWithFormat:@"%@/%@/%@.%@",  
    500                                                         [[NSBundle mainBundle] resourcePath],  
    501                                                         LIST_THEME_FOLDER,  
    502                                                         [prefController preferenceForKey:KEY_LIST_LAYOUT_NAME group:PREF_GROUP_APPEARANCE], 
    503                                                         @"ListLayout"]; 
    504         if(![manager fileExistsAtPath:layout]) 
    505         { 
    506                 NSString *oldLayout = [OLD_LIST_SETTINGS_PATH stringByAppendingPathComponent:[layout lastPathComponent]]; 
    507                 if([manager fileExistsAtPath:oldLayout]) 
    508                         [manager movePath:oldLayout toPath:layout handler:nil]; 
    509         } 
    510 } 
    511  
    512483/*! 
    513484 * @brief Create a new theme