comparison: pidgin/gtkaccount.c
pidgin/gtkaccount.c
- changeset 38285
- 72824d3b7190
- parent 38277
- 061e91dd78d4
- child 38298
- f0a8f63f9312
equal
deleted
inserted
replaced
| 38284:363082ee4eec | 38285:72824d3b7190 |
|---|---|
| 181 g_object_unref(dialog->icon_img); | 181 g_object_unref(dialog->icon_img); |
| 182 dialog->icon_img = NULL; | 182 dialog->icon_img = NULL; |
| 183 } | 183 } |
| 184 | 184 |
| 185 if (new_icon_path != NULL) { | 185 if (new_icon_path != NULL) { |
| 186 dialog->icon_img = purple_image_new_from_file(new_icon_path); | 186 dialog->icon_img = purple_image_new_from_file(new_icon_path, NULL); |
| 187 purple_debug_warning("gtkaccount", "data was not necessary"); | 187 purple_debug_warning("gtkaccount", "data was not necessary"); |
| 188 g_free(data); | 188 g_free(data); |
| 189 } else if (data != NULL) { | 189 } else if (data != NULL) { |
| 190 if (len > 0) | 190 if (len > 0) |
| 191 dialog->icon_img = purple_image_new_from_data(data, len); | 191 dialog->icon_img = purple_image_new_from_data(data, len); |
| 2131 else { | 2131 else { |
| 2132 /* This is for when set_account() is called for a single account */ | 2132 /* This is for when set_account() is called for a single account */ |
| 2133 const char *path; | 2133 const char *path; |
| 2134 path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); | 2134 path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); |
| 2135 if ((path != NULL) && (*path != '\0')) { | 2135 if ((path != NULL) && (*path != '\0')) { |
| 2136 img = purple_image_new_from_file(path); | 2136 img = purple_image_new_from_file(path, NULL); |
| 2137 } | 2137 } |
| 2138 } | 2138 } |
| 2139 } else { | 2139 } else { |
| 2140 img = purple_buddy_icons_find_account_icon(account); | 2140 img = purple_buddy_icons_find_account_icon(account); |
| 2141 } | 2141 } |
