[gnome-screensaver] Move GSettings schemas to gsettings-desktop-schemas
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screensaver] Move GSettings schemas to gsettings-desktop-schemas
- Date: Mon, 7 Feb 2011 18:26:05 +0000 (UTC)
commit d45525331196df6abecfca8445f9b14f068d8252
Author: Bastien Nocera <hadess hadess net>
Date: Mon Feb 7 18:18:37 2011 +0000
Move GSettings schemas to gsettings-desktop-schemas
configure.ac | 1 -
data/Makefile.am | 5 --
data/org.gnome.screensaver.gschema.migrate | 16 -----
data/org.gnome.screensaver.gschema.xml.in.in | 79 --------------------------
src/gs-prefs.c | 2 +-
5 files changed, 1 insertions(+), 102 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6f72f96..2f0625e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -799,7 +799,6 @@ data/Makefile
data/gnome-screensavers.menu
data/gnome-screensaver.pc
data/org.gnome.ScreenSaver.service
-data/org.gnome.screensaver.gschema.xml.in
data/images/Makefile
data/images/cosmos/Makefile
savers/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 38c2766..36c0076 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,11 +12,6 @@ man_MANS = \
@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.gnome.screensaver.gschema.xml
-
-migrationdir = $(datadir)/GConf/gsettings
-dist_migration_DATA = org.gnome.screensaver.gschema.migrate
-
@INTLTOOL_DIRECTORY_RULE@
directorydir = $(datadir)/desktop-directories
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index a98af1a..4e1e9c7 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -39,7 +39,7 @@ static void gs_prefs_finalize (GObject *object);
#define KEY_LOCK_DISABLE "disable-lock-screen"
#define KEY_USER_SWITCH_DISABLE "disable-user-switching"
-#define GS_SETTINGS_SCHEMA "org.gnome.screensaver"
+#define GS_SETTINGS_SCHEMA "org.gnome.desktop.screensaver"
#define KEY_IDLE_ACTIVATION_ENABLED "idle-activation-enabled"
#define KEY_LOCK_ENABLED "lock-enabled"
#define KEY_MODE "mode"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]