# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1181307155 0
# Node ID ef3f817cac9119df62ed52e093a2c25eb8268edb
# Parent  8132d615fae9126f5b66f1b385e3c464028722fd# Parent  13f7a06c240d03437bdcbe60b0f2dd907224a1b7
merge of '73a92318a135ab11655ab5e68f5b079e16d72075'
     and 'e8e7793a2f8c520976c6e1f1cffe1c30697f44bf'

diff -r 8132d615fae9 -r ef3f817cac91 libpurple/protocols/jabber/jabber.c
--- 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);