pidgin: cd3eddd0: If neither a locally-set custom icon nor...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: cd3eddd0c008eb2a1d8776b7d30c45e84586a5d6
Ancestor: ada33a635fb4eb070d7921ee7031927b865d6642
Author: qulogic at pidgin.im
Date: 2009-07-12T20:03:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cd3eddd0c008eb2a1d8776b7d30c45e84586a5d6

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

If neither a locally-set custom icon nor a remotely-set buddy icon can be
found, then reset the icon container size to the minimum again.

Fixes #9671.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	ed74eaf2e46aba148478a63bccd697206294c896
+++ pidgin/gtkconv.c	f757da39b90308e1fd118a34b1e0c8df59d6f60a
@@ -6985,12 +6985,20 @@ pidgin_conv_update_buddy_icon(PurpleConv
 		icon = purple_conv_im_get_icon(PURPLE_CONV_IM(conv));
 
 		if (icon == NULL)
+		{
+			gtk_widget_set_size_request(gtkconv->u.im->icon_container,
+			                            -1, BUDDYICON_SIZE_MIN);
 			return;
+		}
 
 		data = purple_buddy_icon_get_data(icon, &len);
 
 		if (data == NULL)
+		{
+			gtk_widget_set_size_request(gtkconv->u.im->icon_container,
+			                            -1, BUDDYICON_SIZE_MIN);
 			return;
+		}
 	}
 
 	loader = gdk_pixbuf_loader_new();