summaryrefslogtreecommitdiff
path: root/src/gpm-control.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpm-control.c')
-rw-r--r--src/gpm-control.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpm-control.c b/src/gpm-control.c
index 3c945f0..d29146f 100644
--- a/src/gpm-control.c
+++ b/src/gpm-control.c
@@ -40,7 +40,6 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <mate-keyring.h>
-#include <mateconf/mateconf-client.h>
#include <libupower-glib/upower.h>
#include "egg-debug.h"
@@ -55,8 +54,8 @@
struct GpmControlPrivate
{
- MateConfClient *conf;
GSettings *settings;
+ GSettings *settings_ss;
UpClient *client;
};
@@ -122,7 +121,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
See bug #331164 for all the juicy details. :-) */
use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
if (use_ss_setting) {
- do_lock = mateconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
+ do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
egg_debug ("Using ScreenSaver settings (%i)", do_lock);
} else {
do_lock = g_settings_get_boolean (control->priv->settings, policy);
@@ -279,8 +278,8 @@ gpm_control_finalize (GObject *object)
g_return_if_fail (GPM_IS_CONTROL (object));
control = GPM_CONTROL (object);
- g_object_unref (control->priv->conf);
g_object_unref (control->priv->settings);
+ g_object_unref (control->priv->settings_ss);
g_object_unref (control->priv->client);
g_return_if_fail (control->priv != NULL);
@@ -329,7 +328,7 @@ gpm_control_init (GpmControl *control)
control->priv->client = up_client_new ();
control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
- control->priv->conf = mateconf_client_get_default ();
+ control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
}
/**