diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-03 03:52:31 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-03 03:52:31 -0700 |
| commit | 2256a902e87b28697407c304bcb96ab1aeb3f669 (patch) | |
| tree | 723fbf30b7e26a55d01463c0f703bab2c8ee0b88 /src/gs-lock-plug.c | |
| parent | ce7da346624297407644a1be28f75de0856e1f49 (diff) | |
| parent | 8d80642d5cd6ce3522029525505abc991087f258 (diff) | |
| download | mate-screensaver-2256a902e87b28697407c304bcb96ab1aeb3f669.tar.bz2 mate-screensaver-2256a902e87b28697407c304bcb96ab1aeb3f669.tar.xz | |
Merge pull request #8 from NiceandGently/master
gsettings migration
Diffstat (limited to 'src/gs-lock-plug.c')
| -rw-r--r-- | src/gs-lock-plug.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c index 70cf1d7..554d257 100644 --- a/src/gs-lock-plug.c +++ b/src/gs-lock-plug.c @@ -37,7 +37,7 @@ #include <gdk/gdkx.h> #include <X11/XKBlib.h> #include <gtk/gtk.h> -#include <mateconf/mateconf-client.h> +#include <gio/gio.h> #ifdef WITH_KBD_LAYOUT_INDICATOR #include <libmatekbd/matekbd-indicator.h> @@ -51,6 +51,8 @@ #include "gs-debug.h" +#define GSETTINGS_SCHEMA "org.mate.ScreenSaver" + #define KEY_LOCK_DIALOG_THEME "/apps/mate-screensaver/lock_dialog_theme" #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" @@ -1757,11 +1759,11 @@ static char * get_dialog_theme_name (GSLockPlug *plug) { char *name; - MateConfClient *client; + GSettings *settings; - client = mateconf_client_get_default (); - name = mateconf_client_get_string (client, KEY_LOCK_DIALOG_THEME, NULL); - g_object_unref (client); + settings = g_settings_new (GSETTINGS_SCHEMA); + name = g_settings_get_string (settings, KEY_LOCK_DIALOG_THEME); + g_object_unref (settings); return name; } |