comparison 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
comparison
equal deleted inserted replaced
16609:0bad106a6c24 16656:d2809bacb4a0
2069 2069
2070 void 2070 void
2071 pidgin_status_box_set_buddy_icon(PidginStatusBox *status_box, PurpleStoredImage *img) 2071 pidgin_status_box_set_buddy_icon(PidginStatusBox *status_box, PurpleStoredImage *img)
2072 { 2072 {
2073 purple_imgstore_unref(status_box->buddy_icon_img); 2073 purple_imgstore_unref(status_box->buddy_icon_img);
2074 status_box->buddy_icon_img = purple_imgstore_ref(img); 2074 status_box->buddy_icon_img = img;
2075 if (status_box->buddy_icon_img != NULL)
2076 purple_imgstore_ref(status_box->buddy_icon_img);
2075 2077
2076 pidgin_status_box_redisplay_buddy_icon(status_box); 2078 pidgin_status_box_redisplay_buddy_icon(status_box);
2077 } 2079 }
2078 2080
2079 void 2081 void
2223 for(tmp = active_accts; tmp != NULL; tmp = tmp->next) { 2225 for(tmp = active_accts; tmp != NULL; tmp = tmp->next) {
2224 PurpleAccount *acct = tmp->data; 2226 PurpleAccount *acct = tmp->data;
2225 PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct); 2227 PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct);
2226 if (sub) { 2228 if (sub) {
2227 const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub); 2229 const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub);
2228 if (!strcmp(purple_status_type_get_id(sub_type), 2230 const char *subtype_status_id = purple_status_type_get_id(sub_type);
2231 if (subtype_status_id && !strcmp(subtype_status_id,
2229 purple_status_type_get_id(acct_status_type))) 2232 purple_status_type_get_id(acct_status_type)))
2230 found = TRUE; 2233 found = TRUE;
2231 } 2234 }
2232 } 2235 }
2233 if (!found) 2236 if (!found)