adium-1.4 3380:378c29944977: Fix incorrect icon setting through ...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/378c29944977
revision:	3380:378c29944977
author:		Adrian Godoroja <robotive at me.com>
date:		Sat Mar 05 03:40:16 2011 +0200

Fix incorrect icon setting through the Contact List Image Picker. It took a few hours to fix this... :( please don't laugh! Fixes #9908

r=wix

diffs (36 lines):

diff -r ea587caf94d5 -r 378c29944977 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sat Feb 05 22:12:10 2011 -0500
+++ b/ChangeLogs/Changes.txt	Sat Mar 05 03:40:16 2011 +0200
@@ -35,6 +35,7 @@
   * Fixed a hang that occurred when required parts of loaded message styles were missing. (#7438)
   * Fixed "Remove Link" showing up twice in the input box's context menu on 10.6. (Shawn Khan) (#14454)
   * Fixed 1.4 regression where selection of the active voice in the "Speak Event" and "Speak Text" contact alert actions failed. (#14574)
+  * Fixed positioning of selected icon in Recent Icons not being reapplied when icon is reselected. (#9908)
 
  Localisation
   * Updated the Localizable.strings files, adding missing translatable strings/nibs. (#14588)
diff -r ea587caf94d5 -r 378c29944977 Copyright.txt
--- a/Copyright.txt	Sat Feb 05 22:12:10 2011 -0500
+++ b/Copyright.txt	Sat Mar 05 03:40:16 2011 +0200
@@ -29,6 +29,7 @@
 Brian Ganninger
 Thomas Gibson-Robinson
 Kevin Glowacz
+Adrian Godoroja
 Ryan Govostes
 Asher Haig
 Anne Halsall
diff -r ea587caf94d5 -r 378c29944977 Source/AIContactListRecentImagesWindowController.m
--- a/Source/AIContactListRecentImagesWindowController.m	Sat Feb 05 22:12:10 2011 -0500
+++ b/Source/AIContactListRecentImagesWindowController.m	Sat Mar 05 03:40:16 2011 +0200
@@ -183,8 +183,8 @@
 	if (selectedIndex < [recentPictures count]) {
 		id		recentPicture = [recentPictures objectAtIndex:selectedIndex];
 		NSData	*imageData = nil;
-		if ([recentPicture respondsToSelector:@selector(editedImage)])
-			imageData = [[recentPicture editedImage] PNGRepresentation];
+		if ([recentPicture respondsToSelector:@selector(smallIcon)])
+			imageData = [[recentPicture smallIcon] PNGRepresentation];
 		else if ([recentPicture respondsToSelector:@selector(originalImagePath)])
 			imageData = [NSData dataWithContentsOfFile:[recentPicture originalImagePath]];