Mercurial > pidgin.yaz
changeset 9151:e672ee8a12ec
[gaim-migrate @ 9935]
fix prefs dropdowns for boolean prefs, because apparently someone actually wants
one
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 31 May 2004 07:01:13 +0000 |
parents | 05532ad61ed5 |
children | f65be7c97812 |
files | src/gtkprefs.c |
diffstat | 1 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkprefs.c Mon May 31 03:38:47 2004 +0000 +++ b/src/gtkprefs.c Mon May 31 07:01:13 2004 +0000 @@ -156,7 +156,6 @@ static void dropdown_set(GObject *w, const char *key) { - const char *bool_key; const char *str_value; int int_value; GaimPrefType type; @@ -174,13 +173,8 @@ gaim_prefs_set_string(key, str_value); } else if (type == GAIM_PREF_BOOLEAN) { - bool_key = (const char *)g_object_get_data(w, "value"); - - if (!strcmp(key, bool_key)) - return; - - gaim_prefs_set_bool(key, FALSE); - gaim_prefs_set_bool(bool_key, TRUE); + gaim_prefs_set_bool(key, + GPOINTER_TO_INT(g_object_get_data(w, "value"))); } } @@ -192,7 +186,6 @@ GtkWidget *label; GtkWidget *hbox; gchar *text; - const char *bool_key = NULL; const char *stored_str = NULL; int stored_int = 0; int int_value = 0; @@ -247,9 +240,8 @@ g_object_set_data(G_OBJECT(opt), "value", (char *)str_value); } else if (type == GAIM_PREF_BOOLEAN) { - bool_key = (const char *)menuitems->data; - - g_object_set_data(G_OBJECT(opt), "value", (char *)bool_key); + g_object_set_data(G_OBJECT(opt), "value", + menuitems->data); } g_signal_connect(G_OBJECT(opt), "activate", @@ -261,7 +253,8 @@ if ((type == GAIM_PREF_INT && stored_int == int_value) || (type == GAIM_PREF_STRING && stored_str != NULL && !strcmp(stored_str, str_value)) || - (type == GAIM_PREF_BOOLEAN && gaim_prefs_get_bool(bool_key))) { + (type == GAIM_PREF_BOOLEAN && + (gaim_prefs_get_bool(key) == GPOINTER_TO_INT(menuitems->data)))) { gtk_menu_set_active(GTK_MENU(menu), o); } @@ -290,12 +283,15 @@ int int_value; const char *str_value; + g_return_val_if_fail(type == GAIM_PREF_BOOLEAN || type == GAIM_PREF_INT || + type == GAIM_PREF_STRING, NULL); + va_start(ap, key); while ((name = va_arg(ap, char *)) != NULL) { menuitems = g_list_prepend(menuitems, name); - if (type == GAIM_PREF_INT) { + if (type == GAIM_PREF_INT || type == GAIM_PREF_BOOLEAN) { int_value = va_arg(ap, int); menuitems = g_list_prepend(menuitems, GINT_TO_POINTER(int_value)); }