adium 3241:d322fd75bf16: Patch adding version numbers for Xtras ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/d322fd75bf16
revision:	3241:d322fd75bf16
author:		Robert Vehse
date:		Tue Jun 22 00:51:44 2010 +0200

Patch adding version numbers for Xtras to Xtras Manager. Thanks, yelly!

diffs (74 lines):

diff -r 325cd33bbb9f -r d322fd75bf16 Frameworks/Adium Framework/Source/AIXtraInfo.h
--- a/Frameworks/Adium Framework/Source/AIXtraInfo.h	Fri Jun 11 22:13:08 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIXtraInfo.h	Tue Jun 22 00:51:44 2010 +0200
@@ -18,6 +18,7 @@
 @interface AIXtraInfo : NSObject {
 	NSString		*name;
 	NSString		*path;
+	NSString		*version;
 	NSImage			*icon;
 	NSImage			*previewImage;
 	NSString		*resourcePath;
@@ -34,6 +35,7 @@
 - (NSString *)type;
 - (NSString *)path;
 - (NSString *)name;
+- (NSString *)version;
 - (NSString *)resourcePath;
 - (NSString *)readMePath;
 - (NSImage *)icon;
diff -r 325cd33bbb9f -r d322fd75bf16 Frameworks/Adium Framework/Source/AIXtraInfo.m
--- a/Frameworks/Adium Framework/Source/AIXtraInfo.m	Fri Jun 11 22:13:08 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIXtraInfo.m	Tue Jun 22 00:51:44 2010 +0200
@@ -29,6 +29,11 @@
 	return name;
 }
 
+- (NSString *)version
+{
+	return version;
+}
+
 - (void) setName:(NSString *)inName
 {
 	if(!inName) name = @"Unnamed Xtra";
@@ -56,6 +61,7 @@
 		path = [[url path] retain];
 		type = [[[[url path] pathExtension] lowercaseString] retain];
 		xtraBundle = [[NSBundle alloc] initWithPath:path];
+		version = [[xtraBundle objectForInfoDictionaryKey:@"CFBundleVersion"] retain];
 		if (xtraBundle && ([[xtraBundle objectForInfoDictionaryKey:@"XtraBundleVersion"] integerValue] == 1)) { //This checks for a new-style xtra
 			[self setName:[xtraBundle objectForInfoDictionaryKey:(NSString *)kCFBundleNameKey]];
 			resourcePath = [[xtraBundle resourcePath] retain];
@@ -105,6 +111,7 @@
 	[name release];
 	[resourcePath release];
 	[type release];
+	[version release];
 	[readMePath release];
 	[super dealloc];
 }
diff -r 325cd33bbb9f -r d322fd75bf16 Source/AIXtrasManager.m
--- a/Source/AIXtrasManager.m	Fri Jun 11 22:13:08 2010 +0200
+++ b/Source/AIXtrasManager.m	Tue Jun 22 00:51:44 2010 +0200
@@ -429,7 +429,19 @@
 		return [[categories objectAtIndex:row] objectForKey:@"Name"];
 	} else {
 		NSString * name = [[selectedCategory objectAtIndex:row] name];
-		return (name != nil) ? name : @"";
+		NSString * version = [[selectedCategory objectAtIndex:row] version];
+		NSString * displayString;
+
+		if (name) {
+			if (version)
+				displayString = [NSString stringWithFormat:@"%@ (%@)", name, version];
+			else
+				displayString = [NSString stringWithString:name];
+		} else {
+			displayString = [NSString stringWithString:@""];
+		}
+
+		return displayString;
 	}
 }