Mercurial > pidgin.yaz
diff pidgin/gtkstatusbox.c @ 16656:d2809bacb4a0
merge of '00655c64b5e1fd72a35c3884e30acf5bc9bef892'
and '185797cd43f7688a6adffb29894d7da625cdfa22'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2007 15:16:55 +0000 |
| parents | 174d73c90036 |
| children | c737c683c563 |
line wrap: on
line diff
--- a/pidgin/gtkstatusbox.c Sun Apr 29 15:14:29 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Apr 29 15:16:55 2007 +0000 @@ -2071,7 +2071,9 @@ pidgin_status_box_set_buddy_icon(PidginStatusBox *status_box, PurpleStoredImage *img) { purple_imgstore_unref(status_box->buddy_icon_img); - status_box->buddy_icon_img = purple_imgstore_ref(img); + status_box->buddy_icon_img = img; + if (status_box->buddy_icon_img != NULL) + purple_imgstore_ref(status_box->buddy_icon_img); pidgin_status_box_redisplay_buddy_icon(status_box); } @@ -2225,7 +2227,8 @@ PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct); if (sub) { const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub); - if (!strcmp(purple_status_type_get_id(sub_type), + const char *subtype_status_id = purple_status_type_get_id(sub_type); + if (subtype_status_id && !strcmp(subtype_status_id, purple_status_type_get_id(acct_status_type))) found = TRUE; }