changeset 26798:911a325116d5

merge of '55577fa653435bea0213ccd380f914790714f8a1' and 'd7236accdb3567e97b006e952e0ca3a1a49cc913'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 27 Apr 2009 16:25:57 +0000
parents e0d739a002b4 (current diff) f7b409c896cd (diff)
children 12fdc06d73be 0e67e1b7581e
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);