[Gaim-commits] SF.net SVN: gaim: [16359] branches/v2_0_0/src/gtkblist.c

[<the...@us...>]

Revision: 16359
Author:   thekingant
Date:     2006-06-27 09:29:17 -0700 (Tue, 27 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16359&view=rev

Log Message:
-----------
Backport SVN revision #16358 from HEAD To v2_0_0
Original commit message:

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.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16358&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/gtkblist.c
Modified: branches/v2_0_0/src/gtkblist.c
===================================================================
--- branches/v2_0_0/src/gtkblist.c	2006-06-27 16:28:20 UTC (rev 16358)
+++ branches/v2_0_0/src/gtkblist.c	2006-06-27 16:29:17 UTC (rev 16359)
@@ -4461,9 +4461,10 @@
 add_buddy_cb(GtkWidget *w, int resp, GaimGtkAddBuddyData *data)
 {
 	const char *grp, *who, *whoalias;
+	GaimGroup *g;
+	GaimBuddy *b;
 	GaimConversation *c;
-	GaimBuddy *b;
-	GaimGroup *g;
+	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);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.