migrate keybindings applet to gsettings

3 files changed, 164 insertions, 2 deletions

diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index 358b00cc..83faa3a7 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -14,7 +14,8 @@ INCLUDES = \
 	$(MATE_DESKTOP_CFLAGS)						\
 	$(MARCO_CFLAGS)						\
 	$(GSD_DBUS_CFLAGS)						\
-	$(GIO_CFLAGS)
+	$(GIO_CFLAGS)						\
+	$(DCONF_CFLAGS)
 
 
 noinst_LTLIBRARIES = libcommon.la
@@ -26,6 +27,8 @@ libcommon_la_SOURCES = \
 	capplet-stock-icons.h		\
 	capplet-util.c			\
 	capplet-util.h			\
+	dconf-util.c				\
+	dconf-util.h				\
 	file-transfer-dialog.c		\
 	file-transfer-dialog.h		\
 	mate-theme-apply.c		\
@@ -44,7 +47,8 @@ libcommon_la_LIBADD =							\
 	$(MARCO_LIBS)						\
 	$(DBUS_LIBS)							\
 	$(MATE_DESKTOP_LIBS)						\
-	$(GIO_LIBS)
+	$(GIO_LIBS)									\
+	$(DCONF_LIBS)
 
 mate_theme_test_SOURCES = \
 	mate-theme-test.c
diff --git a/capplets/common/dconf-util.c b/capplets/common/dconf-util.c
new file mode 100644
index 00000000..4987a34b
--- /dev/null
+++ b/capplets/common/dconf-util.c
@@ -0,0 +1,113 @@
+/*
+ * dconf-util.c: helper API for dconf
+ *
+ * Copyright (C) 2012 Stefano Karapetsas
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Authors:
+ *  Stefano Karapetsas <[email protected]>
+ *  Vincent Untz <[email protected]>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include <dconf.h>
+
+#include "dconf-util.h"
+
+static DConfClient *
+dconf_util_client_get (void)
+{
+#ifdef HAVE_DCONF_0_13
+    return dconf_client_new ();
+#else
+    return dconf_client_new (NULL, NULL, NULL, NULL);
+#endif
+}
+
+gboolean
+dconf_util_write_sync (const gchar  *key,
+                       GVariant     *value,
+                       GError      **error)
+{
+    gboolean     ret;
+    DConfClient *client = dconf_util_client_get ();
+
+#ifdef HAVE_DCONF_0_13
+    ret = dconf_client_write_sync (client, key, value, NULL, NULL, error);
+#else
+    ret = dconf_client_write (client, key, value, NULL, NULL, error);
+#endif
+
+    g_object_unref (client);
+
+    return ret;
+}
+
+gboolean
+dconf_util_recursive_reset (const gchar  *dir,
+                            GError      **error)
+{
+    gboolean     ret;
+    DConfClient *client = dconf_util_client_get ();
+
+#ifdef HAVE_DCONF_0_13
+    ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error);
+#else
+    ret = dconf_client_write (client, dir, NULL, NULL, NULL, error);
+#endif
+
+    g_object_unref (client);
+
+    return ret;
+}
+
+gchar **
+dconf_util_list_subdirs (const gchar *dir,
+                         gboolean     remove_trailing_slash)
+{
+    GArray       *array;
+    gchar       **children;
+    int       len;
+    int       i;
+    DConfClient  *client = dconf_util_client_get ();
+
+    array = g_array_new (TRUE, TRUE, sizeof (gchar *));
+
+    children = dconf_client_list (client, dir, &len);
+
+    g_object_unref (client);
+
+    for (i = 0; children[i] != NULL; i++) {
+        if (dconf_is_rel_dir (children[i], NULL)) {
+            char *val = g_strdup (children[i]);
+
+            if (remove_trailing_slash)
+                val[strlen (val) - 1] = '\0';
+
+            array = g_array_append_val (array, val);
+        }
+    }
+
+    g_strfreev (children);
+
+    return (gchar **) g_array_free (array, FALSE);
+}
diff --git a/capplets/common/dconf-util.h b/capplets/common/dconf-util.h
new file mode 100644
index 00000000..fe782d93
--- /dev/null
+++ b/capplets/common/dconf-util.h
@@ -0,0 +1,45 @@
+/*
+ * dconf-util.h: helper API for dconf
+ *
+ * Copyright (C) 2012 Stefano Karapetsas
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Authors:
+ *  Stefano Karapetsas <[email protected]>
+ *  Vincent Untz <[email protected]>
+ */
+
+#ifndef __DCONF_UTIL_H__
+#define __DCONF_UTIL_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+gboolean dconf_util_write_sync (const gchar  *key,
+                                 GVariant     *value,
+                                 GError      **error);
+
+gboolean dconf_util_recursive_reset (const gchar  *dir,
+                                      GError     **error);
+
+gchar **dconf_util_list_subdirs (const gchar *dir,
+                                  gboolean     remove_trailing_slash);
+
+G_END_DECLS
+
+#endif /* __DCONF_UTIL_H__ */