diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index e2a757df3..ec0603b29 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,6 +1,7 @@ 2001-12-18 Bradford Hovinen * preferences.c: Update GConf keys to use /desktop/gnome/background + (preferences_load): Use gconf_client rather than gconf_engine 2001-12-17 Bradford Hovinen diff --git a/libbackground/preferences.c b/libbackground/preferences.c index b2f1c52ed..a036ab82b 100644 --- a/libbackground/preferences.c +++ b/libbackground/preferences.c @@ -164,25 +164,25 @@ preferences_finalize (GObject *object) void preferences_load (Preferences *prefs) { - GConfEngine *engine; + GConfClient *client; GError *error = NULL; g_return_if_fail (prefs != NULL); g_return_if_fail (IS_PREFERENCES (prefs)); - engine = gconf_engine_get_default (); + client = gconf_client_get_default (); - prefs->enabled = gconf_engine_get_bool (engine, "/desktop/gnome/background/enabled", &error); - prefs->wallpaper_type = gconf_engine_get_int (engine, "/desktop/gnome/background/wallpaper-type", &error); - prefs->wallpaper_filename = gconf_engine_get_string (engine, "/desktop/gnome/background/wallpaper-filename", &error); - prefs->wallpaper_enabled = gconf_engine_get_bool (engine, "/desktop/gnome/background/wallpaper-enabled", &error); - prefs->color1 = read_color_from_string (gconf_engine_get_string (engine, "/desktop/gnome/background/color1", &error)); - prefs->color2 = read_color_from_string (gconf_engine_get_string (engine, "/desktop/gnome/background/color2", &error)); - prefs->opacity = gconf_engine_get_int (engine, "/desktop/gnome/background/opacity", &error); + prefs->enabled = gconf_client_get_bool (client, "/desktop/gnome/background/enabled", &error); + prefs->wallpaper_type = gconf_client_get_int (client, "/desktop/gnome/background/wallpaper-type", &error); + prefs->wallpaper_filename = gconf_client_get_string (client, "/desktop/gnome/background/wallpaper-filename", &error); + prefs->wallpaper_enabled = gconf_client_get_bool (client, "/desktop/gnome/background/wallpaper-enabled", &error); + prefs->color1 = read_color_from_string (gconf_client_get_string (client, "/desktop/gnome/background/color1", &error)); + prefs->color2 = read_color_from_string (gconf_client_get_string (client, "/desktop/gnome/background/color2", &error)); + prefs->opacity = gconf_client_get_int (client, "/desktop/gnome/background/opacity", &error); if (prefs->opacity >= 100 || prefs->opacity < 0) prefs->adjust_opacity = FALSE; - prefs->orientation = gconf_engine_get_int (engine, "/desktop/gnome/background/orientation", &error); + prefs->orientation = gconf_client_get_int (client, "/desktop/gnome/background/orientation", &error); if (prefs->orientation == ORIENTATION_SOLID) prefs->gradient_enabled = FALSE; diff --git a/libbackground/preferences.h b/libbackground/preferences.h index e83530830..568993096 100644 --- a/libbackground/preferences.h +++ b/libbackground/preferences.h @@ -26,7 +26,7 @@ #include #include -#include +#include #define PREFERENCES(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, preferences_get_type (), Preferences) #define PREFERENCES_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, preferences_get_type (), PreferencesClass)