diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2005-12-14 00:18:55 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2005-12-14 00:18:55 +0000 |
| commit | 55b4392b69f157790ee867f9a7b5257af069e783 (patch) | |
| tree | 076e876af51dc3584f1f64f8755e34205374948e | |
| parent | 4bdcc871e8b02400a7c644a52aebd74dc9d56f4e (diff) | |
| download | gdm-55b4392b69f157790ee867f9a7b5257af069e783.tar.gz | |
Fix bug I introduced into gdmsetup when I made it use the new gdmconfig
2005-12-13 Brian Cameron <brian.cameron@sun.com>
* gui/gdmsetup.c: Fix bug I introduced into
gdmsetup when I made it use the new
gdmconfig functions. Still need to use
ve_config functions when accessing the
server-foo sections.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gui/gdmsetup.c | 9 |
2 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2005-12-13 Brian Cameron <brian.cameron@sun.com> + * gui/gdmsetup.c: Fix bug I introduced into + gdmsetup when I made it use the new + gdmconfig functions. Still need to use + ve_config functions when accessing the + server-foo sections. + +2005-12-13 Brian Cameron <brian.cameron@sun.com> + * gui/Makefile.am: Fix Makefile so that libviciousui.a is used instead of libviciousui-gnome.a. This allows all diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index d80ee6d3..eb6d0b11 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -902,6 +902,7 @@ combobox_timeout (GtkWidget *combo_box) /* Style combobox */ else if (strcmp (key, GDM_KEY_SERVER_CHOOSER) == 0) { + VeConfig *cfg = ve_config_get (config_file); GtkWidget *mod_combobox; GtkWidget *style_combobox; gboolean val_new; @@ -918,13 +919,11 @@ combobox_timeout (GtkWidget *combo_box) section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL); section = g_strconcat(section, GDM_KEY_SERVER_CHOOSER, NULL); - val_old = gdm_config_get_bool (section); + val_old = ve_config_get_bool (cfg, section); val_new = (gtk_combo_box_get_active (GTK_COMBO_BOX (style_combobox)) != 0); /* Update this servers configuration */ if (! ve_bool_equal (val_old, val_new)) { - VeConfig *cfg = ve_config_get (config_file); - ve_config_set_bool (cfg, section, val_new); ve_config_save (cfg, FALSE /* force */); } @@ -4270,6 +4269,7 @@ xserver_entry_timeout (GtkWidget *entry) static gboolean xserver_toggle_timeout (GtkWidget *toggle) { + VeConfig *cfg = ve_config_get (config_file); const char *key = g_object_get_data (G_OBJECT (toggle), "key"); gboolean val; @@ -4287,11 +4287,10 @@ xserver_toggle_timeout (GtkWidget *toggle) section = g_strconcat(section, GDM_KEY_SERVER_CHOOSER, NULL); /* Locate this server's section */ - val = gdm_config_get_bool (section); + val = ve_config_get_bool (cfg, section); /* Update this servers configuration */ if ( ! ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) { - VeConfig *cfg = ve_config_get (config_file); ve_config_set_bool (cfg, section, GTK_TOGGLE_BUTTON (toggle)->active); ve_config_save (cfg, FALSE /* force */); |