Mercurial > pidgin

comparison gtk/gtkstatusbox.c @ 15070:97ae8709d6dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17854] Added ability to keep track of non-cached buddy icons committer: Tailor Script <tailor@pidgin.im>
author Mark Huetsch <markhuetsch>
date Thu, 30 Nov 2006 10:19:09 +0000
parents af2debe897c8
children 32814a36f363
comparison
equal deleted inserted replaced
15069:3d6f2568457c 15070:97ae8709d6dc
1226 if (prplinfo && prplinfo->icon_spec.format) { 1226 if (prplinfo && prplinfo->icon_spec.format) {
1227 char *icon = NULL; 1227 char *icon = NULL;
1228 if (filename) 1228 if (filename)
1229 icon = gaim_gtk_convert_buddy_icon(plug, filename); 1229 icon = gaim_gtk_convert_buddy_icon(plug, filename);
1230 gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", (filename != NULL)); 1230 gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", (filename != NULL));
1231 gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon", icon); 1231 gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon-cached-path", icon);
1232 gaim_account_set_buddy_icon_path(box->account, filename);
1232 gaim_account_set_buddy_icon(box->account, icon); 1233 gaim_account_set_buddy_icon(box->account, icon);
1233 g_free(icon); 1234 g_free(icon);
1234 } 1235 }
1235 } 1236 }
1236 } else { 1237 } else {
1244 gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) && 1245 gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) &&
1245 prplinfo->icon_spec.format) { 1246 prplinfo->icon_spec.format) {
1246 char *icon = NULL; 1247 char *icon = NULL;
1247 if (filename) 1248 if (filename)
1248 icon = gaim_gtk_convert_buddy_icon(plug, filename); 1249 icon = gaim_gtk_convert_buddy_icon(plug, filename);
1250 gaim_account_set_buddy_icon_path(account, filename);
1249 gaim_account_set_buddy_icon(account, icon); 1251 gaim_account_set_buddy_icon(account, icon);
1250 g_free(icon); 1252 g_free(icon);
1251 } 1253 }
1252 } 1254 }
1253 } 1255 }