From 143d4e48e371e26838e8edcdf4c3860568755dff Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Tue, 18 Dec 2001 14:33:23 +0000 Subject: [PATCH] Use GConf (gnomecc_preferences_save): Ditto 2001-12-18 Bradford Hovinen * preferences.c (gnomecc_preferences_load): Use GConf (gnomecc_preferences_save): Ditto --- control-center/ChangeLog | 5 +++++ control-center/preferences.c | 34 ++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 85d278f1f..c2a0f337f 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,8 @@ +2001-12-18 Bradford Hovinen + + * preferences.c (gnomecc_preferences_load): Use GConf + (gnomecc_preferences_save): Ditto + 2001-12-17 Bradford Hovinen * capplet-dir-view.c (capplet_dir_view_init): Move most of the diff --git a/control-center/preferences.c b/control-center/preferences.c index c8b0c1841..78690c727 100644 --- a/control-center/preferences.c +++ b/control-center/preferences.c @@ -32,6 +32,8 @@ #include +#include + static GnomeCCPreferences *old_prefs; static GtkWidget *prefs_dialog; @@ -134,27 +136,35 @@ gnomecc_preferences_copy (GnomeCCPreferences *new, GnomeCCPreferences *old) void gnomecc_preferences_load (GnomeCCPreferences *prefs) { + GConfEngine *engine; + g_return_if_fail (prefs != NULL); - gnome_config_push_prefix ("/control-center/appearance"); - prefs->embed = gnome_config_get_bool ("embed=false"); - prefs->single_window = gnome_config_get_bool ("single_window=true"); - prefs->layout = gnome_config_get_int ("layout=1"); - gnome_config_pop_prefix (); +#if 0 + engine = gconf_engine_get_default (); + + prefs->embed = gconf_engine_get_bool (engine, "/apps/control-center/appearance/embed", NULL); + prefs->single_window = gconf_engine_get_bool (engine, "/apps/control-center/appearance/single-window", NULL); + prefs->layout = gconf_engine_get_int (engine, "/apps/control-center/appearance/layout", NULL); +#endif + + prefs->embed = FALSE; + prefs->single_window = TRUE; + prefs->layout = 1; } void gnomecc_preferences_save (GnomeCCPreferences *prefs) { + GConfEngine *engine; + g_return_if_fail (prefs != NULL); - gnome_config_push_prefix ("/control-center/appearance"); - gnome_config_set_bool ("embed", prefs->embed); - gnome_config_set_bool ("single_window", prefs->single_window); - gnome_config_set_bool ("layout", prefs->layout); - gnome_config_pop_prefix (); + engine = gconf_engine_get_default (); - gnome_config_sync (); + gconf_engine_set_bool (engine, "/apps/control-center/appearance/embed", prefs->embed, NULL); + gconf_engine_set_bool (engine, "/apps/control-center/appearance/single-window", prefs->single_window, NULL); + gconf_engine_set_bool (engine, "/apps/control-center/appearance/layout", prefs->layout, NULL); } static void @@ -317,7 +327,7 @@ gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs) glade_xml_signal_connect (prefs_dialog_data, "tree_widget_toggled_cb", - tree_widget_toggled_cb); + (GCallback) tree_widget_toggled_cb); return prefs_dialog; }