pidgin: d7236acc: We probably shouldn't have to set the pi...

qulogic at pidgin.im qulogic at pidgin.im
Mon Apr 27 00:55:46 EDT 2009


-----------------------------------------------------------------
Revision: d7236accdb3567e97b006e952e0ca3a1a49cc913
Ancestor: 7281ad5ba8e68debd285e06dafebd991e980f3da
Author: qulogic at pidgin.im
Date: 2009-04-27T04:50:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d7236accdb3567e97b006e952e0ca3a1a49cc913

Modified files:
        pidgin/gtkstatusbox.c

ChangeLog: 

We probably shouldn't have to set the pixbuf and the stock-id, but anyway,
sometimes the stock-id is NULL, so don't try to create a pixbuf out of it.

-------------- next part --------------
============================================================
--- pidgin/gtkstatusbox.c	d7467a27dcbb73ac551dee71957bf8759bc60284
+++ pidgin/gtkstatusbox.c	413353b4fada809a4f8ab728bf641a99d4272636
@@ -719,7 +719,8 @@ pidgin_status_box_refresh(PidginStatusBo
 	    }
 
 		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 @@ pidgin_status_box_add(PidginStatusBox *s
 		}
 
 		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);


More information about the Commits mailing list