gsm, capplet: move from gconf to gsettings

This gets us more GNOME 3 compliant.

Note we still use gconf for autostart files that require it.

https://bugzilla.gnome.org/show_bug.cgi?id=639801

6 files changed, 36 insertions, 62 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index eb3b23d2..02933b0f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,40 +27,29 @@ session_DATA = $(session_in_files:.session.desktop.in=.session)
 %.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
 @INTLTOOL_DESKTOP_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
 
-schemas_in_files = gnome-session.schemas.in
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+gsettings_SCHEMAS = org.gnome.SessionManager.gschema.xml org.gnome.desktop.session.gschema.xml
+@GSETTINGS_RULES@
 
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schemas_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
-		done \
-	fi
-uninstall-local:
-	for p in $(schema_DATA) ; do \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/data/$$p ; \
-	done
-endif
+migrationdir = $(datadir)/GConf/gsettings
+dist_migration_DATA = org.gnome.SessionManager.gschema.migrate org.gnome.desktop.session.gschema.migrate
 
 EXTRA_DIST =					\
 	$(xsession_in_files)			\
 	$(session_in_in_files)			\
-	$(schemas_in_files)			\
+	$(gsettings_SCHEMAS:.xml=.xml.in)	\
 	$(ui_DATA)				\
 	$(pixmap_DATA_dist)
 
 CLEANFILES =					\
-	$(schemas_DATA)				\
+	$(gsettings_SCHEMAS:.xml=.xml.in)	\
 	$(xsession_DATA)			\
 	$(desktop_DATA)				\
 	$(session_DATA)
 
 DISTCLEANFILES =				\
+	$(gsettings_SCHEMAS:.xml=.xml.in)	\
 	$(desktop_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/gnome-session.schemas.in b/data/gnome-session.schemas.in
deleted file mode 100644
index f55db084..00000000
--- a/data/gnome-session.schemas.in
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-   <schemalist>
-
-      <schema>
-         <key>/schemas/apps/gnome-session/options/auto_save_session</key>
-         <applyto>/apps/gnome-session/options/auto_save_session</applyto>
-         <owner>gnome</owner>
-         <type>bool</type>
-         <default>false</default>
-         <locale name="C">
-            <short>Save sessions</short>
-            <long>If enabled, gnome-session will save the session automatically.</long>
-         </locale>
-      </schema>
-      <schema>
-         <key>/schemas/apps/gnome-session/options/logout_prompt</key>
-         <applyto>/apps/gnome-session/options/logout_prompt</applyto>
-         <owner>gnome</owner>
-         <type>bool</type>
-         <default>true</default>
-         <locale name="C">
-            <short>Logout prompt</short>
-            <long>If enabled, gnome-session will prompt the user before ending a session.</long>
-         </locale>
-      </schema>
-      <schema>
-        <key>/schemas/desktop/gnome/session/idle_delay</key>
-        <applyto>/desktop/gnome/session/idle_delay</applyto>
-        <owner>gnome</owner>
-        <type>int</type>
-        <default>5</default>
-        <locale name="C">
-          <short>Time before session is considered idle</short>
-          <long>
-            The number of minutes of inactivity before the session is
-            considered idle.
-          </long>
-        </locale>
-      </schema>
-
-   </schemalist>
-</gconfschemafile>
diff --git a/data/org.gnome.SessionManager.gschema.migrate b/data/org.gnome.SessionManager.gschema.migrate
new file mode 100644
index 00000000..fd4dfab1
--- /dev/null
+++ b/data/org.gnome.SessionManager.gschema.migrate
@@ -0,0 +1,3 @@
+[org.gnome.SessionManager]
+auto-save-session = /apps/gnome-session/options/auto_save_session
+logout-prompt = /apps/gnome-session/options/logout_prompt
diff --git a/data/org.gnome.SessionManager.gschema.xml.in b/data/org.gnome.SessionManager.gschema.xml.in
new file mode 100644
index 00000000..05eb9f14
--- /dev/null
+++ b/data/org.gnome.SessionManager.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="gnome-session-3.0">
+  <schema id="org.gnome.SessionManager" path="/org/gnome/GnomeSession/">
+    <key name="auto-save-session" type="b">
+      <default>false</default>
+      <summary>Save sessions</summary>
+      <description>If enabled, gnome-session will save the session automatically.</description>
+    </key>
+    <key name="logout-prompt" type="b">
+      <default>true</default>
+      <summary>Logout prompt</summary>
+      <description>If enabled, gnome-session will prompt the user before ending a session.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.desktop.session.gschema.migrate b/data/org.gnome.desktop.session.gschema.migrate
new file mode 100644
index 00000000..7367763e
--- /dev/null
+++ b/data/org.gnome.desktop.session.gschema.migrate
@@ -0,0 +1,2 @@
+[org.gnome.desktop.session]
+idle-delay = /desktop/gnome/session/idle-delay
diff --git a/data/org.gnome.desktop.session.gschema.xml.in b/data/org.gnome.desktop.session.gschema.xml.in
new file mode 100644
index 00000000..ba7f6c7a
--- /dev/null
+++ b/data/org.gnome.desktop.session.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist gettext-domain="gnome-session-3.0">
+  <schema id="org.gnome.desktop.session" path="/desktop/gnome/session/">
+    <key name="idle-delay" type="i">
+      <default>5</default>
+      <summary>Time before session is considered idle</summary>
+      <description>The number of minutes of inactivity before the session is considered idle.</description>
+    </key>
+  </schema>
+</schemalist>