Changeset 13810
- Timestamp:
- 10/25/2005 10:30:27 PM (3 years ago)
- Files:
-
- trunk/Frameworks/Adium Framework/AISoundSet.m (modified) (1 diff)
- trunk/Plugins/Emoticons/AIEmoticonPack.m (modified) (1 diff)
- trunk/Source/AIDockController.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Frameworks/Adium Framework/AISoundSet.m
r13808 r13810 131 131 BOOL success = YES; 132 132 NSBundle * xtraBundle = [NSBundle bundleWithPath:inPath]; 133 if(xtraBundle && [[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] isEqualToNumber:[NSNumber numberWithInt:1]])//This checks for a new-style xtra 134 { 133 if(xtraBundle && [[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] isEqualToNumber:[NSNumber numberWithInt:1]]) { 135 134 inPath = [xtraBundle resourcePath]; 136 135 name = [[xtraBundle objectForInfoDictionaryKey:@"CFBundleName"]retain]; trunk/Plugins/Emoticons/AIEmoticonPack.m
r13805 r13810 63 63 name = [[[inPath lastPathComponent] stringByDeletingPathExtension] retain]; 64 64 NSBundle * xtraBundle = [NSBundle bundleWithPath:path]; 65 if(xtraBundle && [[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] isEqualToNumber:[NSNumber numberWithInt:1]])//This checks for a new-style xtra 66 { 65 if(xtraBundle && [[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] isEqualToNumber:[NSNumber numberWithInt:1]]) {//This checks for a new-style xtra 67 66 path = [xtraBundle resourcePath]; //new style xtras store the same info, but it's in Contents/Resources/ so that we can have an info.plist file and use NSBundle 68 67 } trunk/Source/AIDockController.m
r13806 r13810 140 140 NSString * path; 141 141 NSBundle * xtraBundle; 142 while((path = [folderPathEnumerator nextObject])) 143 { 142 while((path = [folderPathEnumerator nextObject])) { 144 143 xtraBundle = [NSBundle bundleWithPath:path]; 145 144 if(xtraBundle && [[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] isEqualToNumber:[NSNumber numberWithInt:1]])//This checks for a new-style xtra