# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1181306310 0
# Node ID 13f7a06c240d03437bdcbe60b0f2dd907224a1b7
# Parent  5eebb9b24e30340335eb01d204880c92166b01a0# Parent  4b4eb353cf9f6febbdec288c861920235a0cc03e
merge of '4b50880d8517570eaa67d4cd9d88c5934bb832f1'
     and 'c01626696f1218b430181303c6e69eeba2469947'

diff -r 5eebb9b24e30 -r 13f7a06c240d libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Thu Jun 07 14:47:30 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Fri Jun 08 12:38:30 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);