changeset 17788:ef3f817cac91

merge of '73a92318a135ab11655ab5e68f5b079e16d72075' and 'e8e7793a2f8c520976c6e1f1cffe1c30697f44bf'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 08 Jun 2007 12:52:35 +0000
parents 8132d615fae9 (current diff) 13f7a06c240d (diff)
children f13334f5717e 2af1f8ccd396 c885a9ccd301
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Fri Jun 08 04:50:36 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Fri Jun 08 12:52:35 2007 +0000
@@ -1074,8 +1074,10 @@
 			/* lets make sure our buddy icon is up to date
 			 * before we go letting people know we're here */
 			img = purple_buddy_icons_find_account_icon(js->gc->account);
-			jabber_set_buddy_icon(js->gc, img);
-			purple_imgstore_unref(img);
+			if(NULL != img) {
+				jabber_set_buddy_icon(js->gc, img);
+				purple_imgstore_unref(img);
+			}
 
 			/* now we can alert the core that we're ready to send status */
 			purple_connection_set_state(js->gc, PURPLE_CONNECTED);