# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1151425700 0
# Node ID b869ab32cccc62860942a47b2ab99ad3170cd48b
# Parent  b5ff22440a5b287c35a1a260402a46cdbee90bb3
[gaim-migrate @ 16358]
Fix an assertion failure when adding a buddy to your buddy list and
you have an open conversation with that buddy and you don't have
an icon for them.

committer: Tailor Script <tailor@pidgin.im>

diff -r b5ff22440a5b -r b869ab32cccc src/gtkblist.c
--- a/src/gtkblist.c	Tue Jun 27 06:50:52 2006 +0000
+++ b/src/gtkblist.c	Tue Jun 27 16:28:20 2006 +0000
@@ -4461,9 +4461,10 @@
 add_buddy_cb(GtkWidget *w, int resp, GaimGtkAddBuddyData *data)
 {
 	const char *grp, *who, *whoalias;
-	GaimConversation *c;
+	GaimGroup *g;
 	GaimBuddy *b;
-	GaimGroup *g;
+	GaimConversation *c;
+	GaimBuddyIcon *icon;
 
 	if (resp == GTK_RESPONSE_OK)
 	{
@@ -4500,7 +4501,9 @@
 
 		c = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, who, data->account);
 		if (c != NULL) {
-			gaim_buddy_icon_update(gaim_conv_im_get_icon(GAIM_CONV_IM(c)));
+			icon = gaim_conv_im_get_icon(GAIM_CONV_IM(c));
+			if (icon != NULL)
+				gaim_buddy_icon_update(icon);
 		}
 	}