From db2ac21ee35f785cb21d7b1e782eb34c9753c4f4 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu, 3 Nov 2011 15:33:02 +0000
Subject: Add a GSettings schema with use-conn key

When the NM/ConnMan code lived in Empathy, there was a GSettings key
which could be flipped to false to make Empathy always assume it had a
network connection.

This schema provides one GSettings key,
im.telepathy.MissionControl.FromEmpathy use-conn, which happens to use
the same dconf path as the Empathy key uses. This should make the two
GSettings keys aliases for the same underlying value in dconf; we get a
migration path for free.
---
 .gitignore                                             |  1 +
 Makefile.am                                            |  1 +
 configure.ac                                           |  2 ++
 data/Makefile.am                                       |  9 +++++++++
 ...im.telepathy.MissionControl.FromEmpathy.gschema.xml | 18 ++++++++++++++++++
 5 files changed, 31 insertions(+)
 create mode 100644 data/Makefile.am
 create mode 100644 data/im.telepathy.MissionControl.FromEmpathy.gschema.xml

diff --git a/.gitignore b/.gitignore
index b0fe30ef..6ba0aeeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.gcda
 *.gcno
 *.gcov
+/data/*.valid
 /doc/reference/*/html
 /doc/reference/*/xml
 /doc/reference/*/*-decl-list.txt
diff --git a/Makefile.am b/Makefile.am
index 34e12451..d5af95c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ CHECK_FOR_UNRELEASED := \
     $(NULL)
 
 SUBDIRS = \
+    data \
     m4 \
     tools \
     xml \
diff --git a/configure.ac b/configure.ac
index 42a2c843..562ca9d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,12 +399,14 @@ GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
 AC_SUBST(GLIB_MKENUMS)
 
 GTK_DOC_CHECK([1.17],[--flavour no-tmpl])
+GLIB_GSETTINGS
 
 pluginlibdir=$libdir/mission-control
 AC_SUBST(pluginlibdir)
 
 AC_OUTPUT([
 Makefile \
+data/Makefile \
 doc/Makefile \
 doc/reference/Makefile \
 doc/reference/mission-control-plugins/Makefile \
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..48c778d5
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,9 @@
+gsettings_SCHEMAS = \
+	im.telepathy.MissionControl.FromEmpathy.gschema.xml \
+	$(NULL)
+@GSETTINGS_RULES@
+
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	$(NULL)
+
diff --git a/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml b/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml
new file mode 100644
index 00000000..ad5f595a
--- /dev/null
+++ b/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml
@@ -0,0 +1,18 @@
+<schemalist>
+
+  <enum id="position">
+    <value nick="top-left" value="1"/>
+    <value nick="top-right" value="2"/>
+    <value nick="bottom-left" value="3"/>
+    <value nick="bottom-right" value="4"/>
+  </enum>
+
+  <!-- sic: we are aliasing dconf key paths from Empathy's schema -->
+  <schema id="im.telepathy.MissionControl.FromEmpathy" path="/org/gnome/empathy/">
+    <key name="use-conn" type="b">
+      <default>true</default>
+      <summary>Connectivity managers should be used</summary>
+      <description>Whether connectivity managers should be used to automatically disconnect/reconnect.</description>
+    </key>
+  </schema>
+</schemalist>
-- 
cgit v1.2.1