adium-1.4 3544:fc44da247ca2: Disable the live updating of user i...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/fc44da247ca2
revision:	3544:fc44da247ca2
branch:		(none)
author:		Evan Schoenberg
date:		Sat Jun 25 08:56:34 2011 -0500

Disable the live updating of user icons in the message window. I've seen it turn icons into unknown-image question marks many times, and I can't figure out why. Better just not to update than to have that ugly a bug.

diffs (33 lines):

diff -r 96f346b746a5 -r fc44da247ca2 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Fri Jun 24 18:16:39 2011 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m	Sat Jun 25 08:56:34 2011 -0500
@@ -1281,6 +1281,7 @@
 			}
 		}
 
+		
 		AILogWithSignature(@"%@'s oldWebKitUserIconPath %@, webKitUserIconPath now %@", inObject, oldWebKitUserIconPath, webKitUserIconPath);
 
 		//Make sure it's known that this user has been handled
@@ -1295,6 +1296,10 @@
 		
 		if (!webKitUserIconPath) webKitUserIconPath = @"";
 
+		/* We previously updated existing images with the below code.  There's a bug somewhere, and it results
+		 * in images being replaced with unknown-image question marks sometimes... though new images work fine.
+		 */
+#if 0
 		if ([webView mainFrameDocument]) {
 			//Update existing images if the webView has loaded and has a main frame
 			if (oldWebKitUserIconPath &&
@@ -1325,6 +1330,10 @@
 					   afterDelay:1];
 		}
 	}
+#else
+	[objectIconPathDict setObject:webKitUserIconPath
+						   forKey:iconSourceObject.internalObjectID];
+#endif
 }
 
 - (void)updateServiceIcon