Adium

Changeset 25581

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

Remove the OldListXtras folder and the code that uses it. This breaks code signing if used, and since we have not seen reports of such it is pretty clear not many people are using it.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Adium.xcodeproj/project.pbxproj

    r25555 r25581  
    12031203                639484590EB13DFE008CB6DE /* AIContactHidingController.m in Sources */ = {isa = PBXBuildFile; fileRef = 661561640D84AEEC004B7946 /* AIContactHidingController.m */; }; 
    12041204                6394845B0EB13E04008CB6DE /* AIContactHidingController.h in Headers */ = {isa = PBXBuildFile; fileRef = 661561630D84AEEC004B7946 /* AIContactHidingController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 
    1205                 63AF931A0AA81E2300B88299 /* Bright Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91C90AA8102600B88299 /* Bright Blue.ListTheme */; }; 
    1206                 63AF931B0AA81E2300B88299 /* Bright Green.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CA0AA8102600B88299 /* Bright Green.ListTheme */; }; 
    1207                 63AF931D0AA81E2300B88299 /* Bright Pink.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CC0AA8102600B88299 /* Bright Pink.ListTheme */; }; 
    1208                 63AF931E0AA81E2300B88299 /* Large (iChat).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CD0AA8102700B88299 /* Large (iChat).ListLayout */; }; 
    1209                 63AF931F0AA81E2300B88299 /* Large (with service icons).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CE0AA8102700B88299 /* Large (with service icons).ListLayout */; }; 
    1210                 63AF93200AA81E2300B88299 /* Large.ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91CF0AA8102700B88299 /* Large.ListLayout */; }; 
    1211                 63AF93210AA81E2300B88299 /* Normal (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D00AA8102700B88299 /* Normal (with user icons).ListLayout */; }; 
    1212                 63AF93220AA81E2300B88299 /* Normal.ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D10AA8102700B88299 /* Normal.ListLayout */; }; 
    1213                 63AF93230AA81E2300B88299 /* Pastel Blue (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D20AA8102800B88299 /* Pastel Blue (White on Black).ListTheme */; }; 
    1214                 63AF93240AA81E2300B88299 /* Pastel Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D30AA8102800B88299 /* Pastel Blue.ListTheme */; }; 
    1215                 63AF93250AA81E2300B88299 /* Pastel Gray (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D40AA8102800B88299 /* Pastel Gray (White on Black).ListTheme */; }; 
    1216                 63AF93260AA81E2300B88299 /* Pastel Gray.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D50AA8102800B88299 /* Pastel Gray.ListTheme */; }; 
    1217                 63AF93270AA81E2300B88299 /* Pastel Green (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D60AA8102800B88299 /* Pastel Green (White on Black).ListTheme */; }; 
    1218                 63AF93280AA81E2300B88299 /* Pastel Green.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D70AA8102800B88299 /* Pastel Green.ListTheme */; }; 
    1219                 63AF93290AA81E2300B88299 /* Pastel Pink (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91D80AA8102900B88299 /* Pastel Pink (White on Black).ListTheme */; }; 
    1220                 63AF932B0AA81E2300B88299 /* Pure Black.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DA0AA8102900B88299 /* Pure Black.ListTheme */; }; 
    1221                 63AF932C0AA81E2300B88299 /* Pure White.ListTheme in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DB0AA8102900B88299 /* Pure White.ListTheme */; }; 
    1222                 63AF932D0AA81E2300B88299 /* Tiny (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DC0AA8102900B88299 /* Tiny (with user icons).ListLayout */; }; 
    1223                 63AF932E0AA81E2300B88299 /* Tiny.ListLayout in Copy Legacy ListThemes and ListLayouts */ = {isa = PBXBuildFile; fileRef = 63AF91DD0AA8102A00B88299 /* Tiny.ListLayout */; }; 
    12241205                63C120750910A0DD00C9DB57 /* DefaultXtraReadme.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 63C120740910A0DD00C9DB57 /* DefaultXtraReadme.rtf */; }; 
    12251206                63DF5B220E52D77F00010E99 /* AIContactList.m in Sources */ = {isa = PBXBuildFile; fileRef = 63DF5B200E52D77F00010E99 /* AIContactList.m */; }; 
    …… 
    18161797                        dstSubfolderSpec = 7; 
    18171798                        files = ( 
    1818                                 63AF931A0AA81E2300B88299 /* Bright Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1819                                 63AF931B0AA81E2300B88299 /* Bright Green.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1820                                 63AF931D0AA81E2300B88299 /* Bright Pink.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1821                                 63AF931E0AA81E2300B88299 /* Large (iChat).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1822                                 63AF931F0AA81E2300B88299 /* Large (with service icons).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1823                                 63AF93200AA81E2300B88299 /* Large.ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1824                                 63AF93210AA81E2300B88299 /* Normal (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1825                                 63AF93220AA81E2300B88299 /* Normal.ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1826                                 63AF93230AA81E2300B88299 /* Pastel Blue (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1827                                 63AF93240AA81E2300B88299 /* Pastel Blue.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1828                                 63AF93250AA81E2300B88299 /* Pastel Gray (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1829                                 63AF93260AA81E2300B88299 /* Pastel Gray.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1830                                 63AF93270AA81E2300B88299 /* Pastel Green (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1831                                 63AF93280AA81E2300B88299 /* Pastel Green.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1832                                 63AF93290AA81E2300B88299 /* Pastel Pink (White on Black).ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1833                                 63AF932B0AA81E2300B88299 /* Pure Black.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1834                                 63AF932C0AA81E2300B88299 /* Pure White.ListTheme in Copy Legacy ListThemes and ListLayouts */, 
    1835                                 63AF932D0AA81E2300B88299 /* Tiny (with user icons).ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    1836                                 63AF932E0AA81E2300B88299 /* Tiny.ListLayout in Copy Legacy ListThemes and ListLayouts */, 
    18371799                        ); 
    18381800                        name = "Copy Legacy ListThemes and ListLayouts"; 
    …… 
    41674129                636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_AIM.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt"; sourceTree = "<group>"; }; 
    41684130                638392F609D4D67A0067B9B7 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; }; 
    4169                 63AF91C90AA8102600B88299 /* Bright Blue.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Bright Blue.ListTheme"; sourceTree = "<group>"; }; 
    4170                 63AF91CA0AA8102600B88299 /* Bright Green.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Bright Green.ListTheme"; sourceTree = "<group>"; }; 
    4171                 63AF91CC0AA8102600B88299 /* Bright Pink.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Bright Pink.ListTheme"; sourceTree = "<group>"; }; 
    4172                 63AF91CD0AA8102700B88299 /* Large (iChat).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Large (iChat).ListLayout"; sourceTree = "<group>"; }; 
    4173                 63AF91CE0AA8102700B88299 /* Large (with service icons).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Large (with service icons).ListLayout"; sourceTree = "<group>"; }; 
    4174                 63AF91CF0AA8102700B88299 /* Large.ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Large.ListLayout; sourceTree = "<group>"; }; 
    4175                 63AF91D00AA8102700B88299 /* Normal (with user icons).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Normal (with user icons).ListLayout"; sourceTree = "<group>"; }; 
    4176                 63AF91D10AA8102700B88299 /* Normal.ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Normal.ListLayout; sourceTree = "<group>"; }; 
    4177                 63AF91D20AA8102800B88299 /* Pastel Blue (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Blue (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4178                 63AF91D30AA8102800B88299 /* Pastel Blue.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Blue.ListTheme"; sourceTree = "<group>"; }; 
    4179                 63AF91D40AA8102800B88299 /* Pastel Gray (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Gray (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4180                 63AF91D50AA8102800B88299 /* Pastel Gray.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Gray.ListTheme"; sourceTree = "<group>"; }; 
    4181                 63AF91D60AA8102800B88299 /* Pastel Green (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Green (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4182                 63AF91D70AA8102800B88299 /* Pastel Green.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Green.ListTheme"; sourceTree = "<group>"; }; 
    4183                 63AF91D80AA8102900B88299 /* Pastel Pink (White on Black).ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pastel Pink (White on Black).ListTheme"; sourceTree = "<group>"; }; 
    4184                 63AF91DA0AA8102900B88299 /* Pure Black.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pure Black.ListTheme"; sourceTree = "<group>"; }; 
    4185                 63AF91DB0AA8102900B88299 /* Pure White.ListTheme */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Pure White.ListTheme"; sourceTree = "<group>"; }; 
    4186                 63AF91DC0AA8102900B88299 /* Tiny (with user icons).ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Tiny (with user icons).ListLayout"; sourceTree = "<group>"; }; 
    4187                 63AF91DD0AA8102A00B88299 /* Tiny.ListLayout */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Tiny.ListLayout; sourceTree = "<group>"; }; 
    41884131                63C120740910A0DD00C9DB57 /* DefaultXtraReadme.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = DefaultXtraReadme.rtf; path = Resources/DefaultXtraReadme.rtf; sourceTree = "<group>"; }; 
    41894132                63DEB88D09BD3FEC0026DC69 /* AIXtraPreviewImageController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIXtraPreviewImageController.h; path = Source/AIXtraPreviewImageController.h; sourceTree = "<group>"; }; 
    …… 
    72437186                        sourceTree = "<group>"; 
    72447187                }; 
    7245                 63AF91C80AA80FE300B88299 /* OldListXtras */ = { 
    7246                         isa = PBXGroup; 
    7247                         children = ( 
    7248                                 63AF91C90AA8102600B88299 /* Bright Blue.ListTheme */, 
    7249                                 63AF91CA0AA8102600B88299 /* Bright Green.ListTheme */, 
    7250                                 63AF91CC0AA8102600B88299 /* Bright Pink.ListTheme */, 
    7251                                 63AF91CD0AA8102700B88299 /* Large (iChat).ListLayout */, 
    7252                                 63AF91CE0AA8102700B88299 /* Large (with service icons).ListLayout */, 
    7253                                 63AF91CF0AA8102700B88299 /* Large.ListLayout */, 
    7254                                 63AF91D00AA8102700B88299 /* Normal (with user icons).ListLayout */, 
    7255                                 63AF91D10AA8102700B88299 /* Normal.ListLayout */, 
    7256                                 63AF91D20AA8102800B88299 /* Pastel Blue (White on Black).ListTheme */, 
    7257                                 63AF91D30AA8102800B88299 /* Pastel Blue.ListTheme */, 
    7258                                 63AF91D40AA8102800B88299 /* Pastel Gray (White on Black).ListTheme */, 
    7259                                 63AF91D50AA8102800B88299 /* Pastel Gray.ListTheme */, 
    7260                                 63AF91D60AA8102800B88299 /* Pastel Green (White on Black).ListTheme */, 
    7261                                 63AF91D70AA8102800B88299 /* Pastel Green.ListTheme */, 
    7262                                 63AF91D80AA8102900B88299 /* Pastel Pink (White on Black).ListTheme */, 
    7263                                 63AF91DA0AA8102900B88299 /* Pure Black.ListTheme */, 
    7264                                 63AF91DB0AA8102900B88299 /* Pure White.ListTheme */, 
    7265                                 63AF91DC0AA8102900B88299 /* Tiny (with user icons).ListLayout */, 
    7266                                 63AF91DD0AA8102A00B88299 /* Tiny.ListLayout */, 
    7267                         ); 
    7268                         name = OldListXtras; 
    7269                         path = Resources/OldListXtras; 
    7270                         sourceTree = "<group>"; 
    7271                 }; 
    72727188                661561620D84AEB0004B7946 /* Contact Hiding */ = { 
    72737189                        isa = PBXGroup; 
    …… 
    77087624                                F59DB6AD033EB74801A8010A /* main.m */, 
    77097625                                34575E3807CBA88E004A4FFF /* MainMenu.nib */, 
    7710                                 63AF91C80AA80FE300B88299 /* OldListXtras */, 
    77117626                                4B191D890611C10800E8A4E7 /* ReadMe.rtf */, 
    77127627                                34D8326307CBD598006466F2 /* sendfile.png */, 

  • trunk/Source/AIAppearancePreferences.m

    r25494 r25581  
    3636#import <Adium/ESPresetNameSheetController.h> 
    3737#import <AIMenuBarIcons.h> 
    38  
    39 #define OLD_LIST_SETTINGS_PATH [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"OldListXtras"] 
    4038 
    4139typedef enum { 
    …… 
    486484                                                        [prefController preferenceForKey:KEY_LIST_THEME_NAME group:PREF_GROUP_APPEARANCE], 
    487485                                                        LIST_THEME_EXTENSION]; 
    488         if(![manager fileExistsAtPath:theme]) 
    489         { 
    490                 NSString *oldTheme = [OLD_LIST_SETTINGS_PATH stringByAppendingPathComponent:[theme lastPathComponent]]; 
    491                 if([manager fileExistsAtPath:oldTheme]) 
    492                         [manager moveItemAtPath:oldTheme toPath:theme error:NULL]; 
    493         } 
    494486        NSString *layout = [NSString stringWithFormat:@"%@/%@/%@.%@",  
    495487                                                        [[NSBundle mainBundle] resourcePath],  
    …… 
    497489                                                        [prefController preferenceForKey:KEY_LIST_LAYOUT_NAME group:PREF_GROUP_APPEARANCE], 
    498490                                                        @"ListLayout"]; 
    499         if(![manager fileExistsAtPath:layout]) 
    500         { 
    501                 NSString *oldLayout = [OLD_LIST_SETTINGS_PATH stringByAppendingPathComponent:[layout lastPathComponent]]; 
    502                 if([manager fileExistsAtPath:oldLayout]) 
    503                         [manager moveItemAtPath:oldLayout toPath:layout error:NULL]; 
    504         } 
    505491} 
    506492