1.1 --- a/Frameworks/Adium Framework/Source/AIXtraInfo.h	Fri Jun 11 22:13:08 2010 +0200
     1.2 +++ b/Frameworks/Adium Framework/Source/AIXtraInfo.h	Tue Jun 22 00:51:44 2010 +0200
     1.3 @@ -18,6 +18,7 @@
     1.4  @interface AIXtraInfo : NSObject {
     1.5  	NSString		*name;
     1.6  	NSString		*path;
     1.7 +	NSString		*version;
     1.8  	NSImage			*icon;
     1.9  	NSImage			*previewImage;
    1.10  	NSString		*resourcePath;
    1.11 @@ -34,6 +35,7 @@
    1.12  - (NSString *)type;
    1.13  - (NSString *)path;
    1.14  - (NSString *)name;
    1.15 +- (NSString *)version;
    1.16  - (NSString *)resourcePath;
    1.17  - (NSString *)readMePath;
    1.18  - (NSImage *)icon;

     2.1 --- a/Frameworks/Adium Framework/Source/AIXtraInfo.m	Fri Jun 11 22:13:08 2010 +0200
     2.2 +++ b/Frameworks/Adium Framework/Source/AIXtraInfo.m	Tue Jun 22 00:51:44 2010 +0200
     2.3 @@ -29,6 +29,11 @@
     2.4  	return name;
     2.5  }
     2.6  
     2.7 +- (NSString *)version
     2.8 +{
     2.9 +	return version;
    2.10 +}
    2.11 +
    2.12  - (void) setName:(NSString *)inName
    2.13  {
    2.14  	if(!inName) name = @"Unnamed Xtra";
    2.15 @@ -56,6 +61,7 @@
    2.16  		path = [[url path] retain];
    2.17  		type = [[[[url path] pathExtension] lowercaseString] retain];
    2.18  		xtraBundle = [[NSBundle alloc] initWithPath:path];
    2.19 +		version = [[xtraBundle objectForInfoDictionaryKey:@"CFBundleVersion"] retain];
    2.20  		if (xtraBundle && ([[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] integerValue] == 1)) { //This checks for a new-style xtra
    2.21  			[self setName:[xtraBundle objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey]];
    2.22  			resourcePath = [[xtraBundle resourcePath] retain];
    2.23 @@ -105,6 +111,7 @@
    2.24  	[name release];
    2.25  	[resourcePath release];
    2.26  	[type release];
    2.27 +	[version release];
    2.28  	[readMePath release];
    2.29  	[super dealloc];
    2.30  }

     3.1 --- a/Source/AIXtrasManager.m	Fri Jun 11 22:13:08 2010 +0200
     3.2 +++ b/Source/AIXtrasManager.m	Tue Jun 22 00:51:44 2010 +0200
     3.3 @@ -429,7 +429,19 @@
     3.4  		return [[categories objectAtIndex:row] objectForKey:@"Name"];
     3.5  	} else {
     3.6  		NSString * name = [[selectedCategory objectAtIndex:row] name];
     3.7 -		return (name != nil) ? name : @"";
     3.8 +		NSString * version = [[selectedCategory objectAtIndex:row] version];
     3.9 +		NSString * displayString;
    3.10 +
    3.11 +		if (name) {
    3.12 +			if (version)
    3.13 +				displayString = [NSString stringWithFormat:@"%@ (%@)", name, version];
    3.14 +			else
    3.15 +				displayString = [NSString stringWithString:name];
    3.16 +		} else {
    3.17 +			displayString = [NSString stringWithString:@""];
    3.18 +		}
    3.19 +
    3.20 +		return displayString;
    3.21  	}
    3.22  }
    3.23