[Gaim-commits] SF.net SVN: gaim: [16799] trunk/src/gtkstatusbox.c

[<sa...@us...>]

Revision: 16799
Author:   sadrul
Date:     2006-08-16 12:38:57 -0700 (Wed, 16 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16799&view=rev

Log Message:
-----------
Use the proper setting-name.
"seanegan: sadrul: Looks good. You may want to set the non-global-buddyicon account setting if use-global-buddyicon is not set"
Also, if the user sets the buddy-icon from a per-account box, it unsets the use-global-budduicon setting for that account.

Modified Paths:
--------------
    trunk/src/gtkstatusbox.c
Modified: trunk/src/gtkstatusbox.c
===================================================================
--- trunk/src/gtkstatusbox.c	2006-08-16 19:21:04 UTC (rev 16798)
+++ trunk/src/gtkstatusbox.c	2006-08-16 19:38:57 UTC (rev 16799)
@@ -253,7 +253,8 @@
 static void
 setup_icon_box(GtkGaimStatusBox *status_box)
 {
-	if (status_box->account)
+	if (status_box->account &&
+		!gaim_account_get_ui_bool(status_box->account, GAIM_GTK_UI, "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);
@@ -1002,13 +1003,14 @@
 				char *icon = gaim_gtk_convert_buddy_icon(plug, filename);
 				gaim_account_set_buddy_icon(box->account, icon);
 				g_free(icon);
+				gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", FALSE);
 			}
 		} else {
 			for (accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
 				GaimAccount *account = accounts->data;
 				GaimPlugin *plug = gaim_find_prpl(gaim_account_get_protocol_id(account));
 				GaimPluginProtocolInfo *prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plug);
-				if (gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddy-icon", TRUE) &&
+				if (gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) &&
 					prplinfo->icon_spec.format) {
 					char *icon = gaim_gtk_convert_buddy_icon(plug, filename);
 					gaim_account_set_buddy_icon(account, icon);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.