# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1240849557 0
# Node ID 911a325116d50484cbfb3d3f49f66cea79adc390
# Parent  e0d739a002b4473a8080f277cb5ab08d517fa505# Parent  f7b409c896cdfebe5d5f03bcd0c79b43a4ffa131
merge of '55577fa653435bea0213ccd380f914790714f8a1'
     and 'd7236accdb3567e97b006e952e0ca3a1a49cc913'

diff -r e0d739a002b4 -r 911a325116d5 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Mon Apr 27 04:52:41 2009 +0000
+++ b/pidgin/gtkstatusbox.c	Mon Apr 27 16:25:57 2009 +0000
@@ -719,7 +719,8 @@
 	    }
 
 		stock = pidgin_stock_id_from_status_primitive(prim);
-		pixbuf = pidgin_status_box_get_pixbuf(status_box, stock);
+		if (stock)
+			pixbuf = pidgin_status_box_get_pixbuf(status_box, stock);
 	}
 
 	if (status_box->account != NULL) {
@@ -2158,7 +2159,8 @@
 		}
 
 		stock = pidgin_stock_id_from_status_primitive(prim);
-		pixbuf = pidgin_status_box_get_pixbuf(status_box, stock);
+		if (stock)
+			pixbuf = pidgin_status_box_get_pixbuf(status_box, stock);
 	}
 
 	gtk_list_store_append(status_box->dropdown_store, &iter);