Mercurial > pidgin.yaz
diff gtk/gtkstatusbox.c @ 15140:63d554c2675d
[gaim-migrate @ 17925]
This seems like a reasonable way to tell the prpl if we're using a local or global buddy icon.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Huetsch <markhuetsch> |
|---|---|
| date | Sat, 09 Dec 2006 07:20:46 +0000 |
| parents | e3e668ddf945 |
| children | 7696f5dec7d8 |
line wrap: on
line diff
--- a/gtk/gtkstatusbox.c Sat Dec 09 06:34:48 2006 +0000 +++ b/gtk/gtkstatusbox.c Sat Dec 09 07:20:46 2006 +0000 @@ -331,7 +331,7 @@ gtk_widget_show(status_box->icon_box); if (status_box->account && - !gaim_account_get_ui_bool(status_box->account, GAIM_GTK_UI, "use-global-buddyicon", TRUE)) + !gaim_account_get_bool(status_box->account, "use-global-buddyicon", TRUE)) { char *string = gaim_buddy_icons_get_full_path(gaim_account_get_buddy_icon(status_box->account)); gtk_gaim_status_box_set_buddy_icon(status_box, string); @@ -1340,7 +1340,7 @@ char *icon = NULL; if (filename) icon = gaim_gtk_convert_buddy_icon(plug, filename); - gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", (filename != NULL)); + gaim_account_set_bool(box->account, "use-global-buddyicon", (filename != NULL)); gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon-cached-path", icon); gaim_account_set_buddy_icon_path(box->account, filename); gaim_account_set_buddy_icon(box->account, icon); @@ -1355,7 +1355,7 @@ if (plug) { GaimPluginProtocolInfo *prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plug); if (prplinfo != NULL && - gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) && + gaim_account_get_bool(account, "use-global-buddyicon", TRUE) && prplinfo->icon_spec.format) { char *icon = NULL; if (filename)