diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/gpm-common.h | 4 | ||||
| -rw-r--r-- | src/gpm-control.c | 9 | ||||
| -rw-r--r-- | src/gpm-screensaver.c | 10 | ||||
| -rw-r--r-- | src/gpm-statistics.c | 1 |
5 files changed, 13 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 8271e34..00a3e4f 100644 --- a/configure.ac +++ b/configure.ac @@ -103,14 +103,13 @@ GLIB_REQUIRED=2.13.0 GIO_REQUIRED=2.25.0 GTK_REQUIRED=2.17.7 GDK_REQUIRED=2.11.0 -MATECONF_REQUIRED=1.1.0 MATE_KEYRING_REQUIRED=1.1.0 DBUS_REQUIRED=1.0 DBUS_GLIB_REQUIRED=0.70 LIBMATENOTIFY_REQUIRED=1.1.0 CAIRO_REQUIRED=1.0.0 UNIQUE_REQUIRED=0.9.4 -LIBPANEL_REQUIRED=1.1.0 +LIBPANEL_REQUIRED=1.5.0 XRANDR_REQUIRED=1.2.0 CANBERRA_REQUIRED=0.10 UPOWER_REQUIRED=0.9.1 @@ -152,7 +151,6 @@ PKG_CHECK_MODULES(DBUS,[ PKG_CHECK_MODULES(MATE, [ gtk+-2.0 >= $GTK_REQUIRED - mateconf-2.0 >= $MATECONF_REQUIRED mate-keyring-1 >= $MATE_KEYRING_REQUIRED cairo >= $CAIRO_REQUIRED]) @@ -265,7 +263,7 @@ have_applets=no if test x$enable_applets = xyes ; then have_applets=yes - PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-3.0 >= $LIBPANEL_REQUIRED]) + PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-4.0 >= $LIBPANEL_REQUIRED]) AC_DEFINE(HAVE_APPLETS, 1, [Define if we are building applets]) fi AC_MSG_RESULT([$have_applets]) diff --git a/src/gpm-common.h b/src/gpm-common.h index 5cb0696..48bb89d 100644 --- a/src/gpm-common.h +++ b/src/gpm-common.h @@ -127,8 +127,8 @@ G_BEGIN_DECLS #define GPM_SETTINGS_INFO_LAST_DEVICE "info-last-device" /* mate-screensaver */ -#define GS_CONF_DIR "/apps/mate-screensaver" -#define GS_CONF_PREF_LOCK_ENABLED GS_CONF_DIR "/lock_enabled" +#define GS_SETTINGS_SCHEMA "org.mate.screensaver" +#define GS_SETTINGS_PREF_LOCK_ENABLED "lock-enabled" typedef enum { GPM_ICON_POLICY_ALWAYS, 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); } /** diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c index 3856b3b..5d049dc 100644 --- a/src/gpm-screensaver.c +++ b/src/gpm-screensaver.c @@ -25,7 +25,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <dbus/dbus-glib.h> -#include <mateconf/mateconf-client.h> +#include <gio/gio.h> #include "gpm-screensaver.h" #include "gpm-common.h" @@ -42,7 +42,7 @@ static void gpm_screensaver_finalize (GObject *object); struct GpmScreensaverPrivate { DBusGProxy *proxy; - MateConfClient *conf; + GSettings *settings; }; enum { @@ -137,7 +137,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver) { gboolean enabled; g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE); - enabled = mateconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL); + enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED); return enabled; } @@ -357,7 +357,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver) GS_LISTENER_SERVICE, GS_LISTENER_PATH, GS_LISTENER_INTERFACE); - screensaver->priv->conf = mateconf_client_get_default (); + screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA); } /** @@ -374,7 +374,7 @@ gpm_screensaver_finalize (GObject *object) screensaver = GPM_SCREENSAVER (object); screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver); - g_object_unref (screensaver->priv->conf); + g_object_unref (screensaver->priv->settings); g_object_unref (screensaver->priv->proxy); G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object); diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c index 00a7d99..3284067 100644 --- a/src/gpm-statistics.c +++ b/src/gpm-statistics.c @@ -28,7 +28,6 @@ #include <gtk/gtk.h> #include <dbus/dbus-glib.h> -#include <mateconf/mateconf-client.h> #include <libupower-glib/upower.h> #include "egg-debug.h" |