adium 2839:ecb36859abb9: Add a small IRC icon and an improved la...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/ecb36859abb9
revision:	2839:ecb36859abb9
author:		Zachary West <zacw at adium.im>
date:		Sat Oct 31 15:52:20 2009 -0400

Add a small IRC icon and an improved larger one. Refs #12697.

diffs (73 lines):

diff -r 2d3f7242a158 -r ecb36859abb9 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Sat Oct 31 16:02:31 2009 -0400
+++ b/Adium.xcodeproj/project.pbxproj	Sat Oct 31 15:52:20 2009 -0400
@@ -164,6 +164,7 @@
 		11AE53610F68CE3300BE8077 /* AIPurpleOscarAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */; };
 		11AE53620F68CE3300BE8077 /* AIPurpleOscarAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */; };
 		11AE5555109CC88C0074BDC2 /* pref-confirmations.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5554109CC88C0074BDC2 /* pref-confirmations.png */; };
+		11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5575109CCC950074BDC2 /* irc-small.png */; };
 		11BD73AE0F5A53EA007D438A /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
 		11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D10F5A54BB007D438A /* twitter-small.png */; };
 		11BD73D40F5A54BB007D438A /* twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D20F5A54BB007D438A /* twitter.png */; };
@@ -1969,6 +1970,7 @@
 		11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPurpleOscarAccountViewController.h; path = "Plugins/Purple Service/AIPurpleOscarAccountViewController.h"; sourceTree = "<group>"; };
 		11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPurpleOscarAccountViewController.m; path = "Plugins/Purple Service/AIPurpleOscarAccountViewController.m"; sourceTree = "<group>"; };
 		11AE5554109CC88C0074BDC2 /* pref-confirmations.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-confirmations.png"; path = "Resources/pref-confirmations.png"; sourceTree = "<group>"; };
+		11AE5575109CCC950074BDC2 /* irc-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "irc-small.png"; path = "Plugins/Purple Service/irc-small.png"; sourceTree = "<group>"; };
 		11BD73D10F5A54BB007D438A /* twitter-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "twitter-small.png"; path = "Plugins/Twitter Plugin/twitter-small.png"; sourceTree = "<group>"; };
 		11BD73D20F5A54BB007D438A /* twitter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = twitter.png; path = "Plugins/Twitter Plugin/twitter.png"; sourceTree = "<group>"; };
 		11BE28980FCC7C13000E6A10 /* AIPicImImageUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPicImImageUploader.h; path = "Plugins/Image Uploading Plugin/AIPicImImageUploader.h"; sourceTree = "<group>"; };
@@ -6084,6 +6086,7 @@
 				34E4CD510E68277D00D1B0DC /* ESIRCJoinChatView.nib */,
 				34E4CD500E68277D00D1B0DC /* ESIRCJoinChatViewController.h */,
 				34E4CD4F0E68277D00D1B0DC /* ESIRCJoinChatViewController.m */,
+				11AE5575109CCC950074BDC2 /* irc-small.png */,
 				34E4CD640E68279C00D1B0DC /* irc.png */,
 				34E4CD650E68279C00D1B0DC /* PurpleDefaultsIRC.plist */,
 			);
@@ -9608,6 +9611,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */,
 				3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.nib in Resources */,
 				3485DB6209EBCE7400232CC4 /* ESPurpleGaduGaduAccountView.nib in Resources */,
 				3485DB6309EBCE7400232CC4 /* PurpleDefaultsGadu-Gadu.plist in Resources */,
diff -r 2d3f7242a158 -r ecb36859abb9 Plugins/Purple Service/ESIRCService.m
--- a/Plugins/Purple Service/ESIRCService.m	Sat Oct 31 16:02:31 2009 -0400
+++ b/Plugins/Purple Service/ESIRCService.m	Sat Oct 31 15:52:20 2009 -0400
@@ -102,13 +102,11 @@
  */
 - (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType
 {
-	NSImage *baseImage = [NSImage imageNamed:@"irc" forClass:[self class] loadLazily:YES];
-
-	if (iconType == AIServiceIconSmall || iconType == AIServiceIconList) {
-		baseImage = [baseImage imageByScalingToSize:NSMakeSize(16, 16)];
-    }
-
-	return baseImage;
+	if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
+		return [NSImage imageNamed:@"irc-small" forClass:[self class] loadLazily:YES];
+	} else {
+		return [NSImage imageNamed:@"irc" forClass:[self class] loadLazily:YES];
+	}
 }
 
 /*!
@@ -122,9 +120,9 @@
 - (NSString *)pathForDefaultServiceIconOfType:(AIServiceIconType)iconType
 {
 	if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
-		return nil; //xxx add small IRC icon
+		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"irc-small"];
 	} else {
-		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"irc"];		
+		return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"irc"];
 	}
 }
 
diff -r 2d3f7242a158 -r ecb36859abb9 Plugins/Purple Service/irc-small.png
Binary file Plugins/Purple Service/irc-small.png has changed
diff -r 2d3f7242a158 -r ecb36859abb9 Plugins/Purple Service/irc.png
Binary file Plugins/Purple Service/irc.png has changed