Permalink
Browse files

migrate keybindings applet to gsettings

  • Loading branch information...
1 parent 7544506 commit ae46e7dc17aa620b25cae52a8c576022ecc1c66b @stefano-k stefano-k committed Oct 27, 2012
View
@@ -14,7 +14,9 @@ SUBDIRS += typing-break
endif
@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.control-center.gschema.xml
+gsettings_SCHEMAS = \
+ org.mate.control-center.gschema.xml \
+ org.mate.control-center.keybinding.gschema.xml
@GSETTINGS_RULES@
%.gschema.xml.in: %.gschema.xml.in.in Makefile
View
2 NEWS
@@ -1,7 +1,7 @@
1.5.0
* Migration to gsettings.
- * Keybindings capplet is disabled (not yet migrated).
+ * Keybindings capplet: requires libdconf-dev to delete custom shortcuts.
* Appearance capplet: increased minimum dialog size.
* Network capplet: use proxy settings from gsettings-desktop-schemas
package (http://download.gnome.org/sources/gsettings-desktop-schemas).
View
@@ -5,14 +5,11 @@ SUBDIRS = \
default-applications \
display \
keyboard \
+ keybindings \
mouse \
network \
windows
-# Enable these applets when migrated to gsettings
-GSETTINS_DISABLED_SUBDIRS = \
- keybindings
-
DIST_SUBDIRS = \
common \
accessibility \
@@ -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
@@ -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 <stefano@karapetsas.com>
+ * Vincent Untz <vuntz@gnome.org>
+ */
+
+#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);
+}
@@ -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 <stefano@karapetsas.com>
+ * Vincent Untz <vuntz@gnome.org>
+ */
+
+#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__ */
@@ -1,35 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Sound">
+<KeyListEntries name="Sound" schema="org.mate.SettingsDaemon.plugins.media-keys" package="mate-settings-daemon">
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/volume_mute" />
+ <KeyListEntry name="volume-mute" description="Volume mute" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/volume_down" />
+ <KeyListEntry name="volume-down" description="Volume down" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/volume_up" />
+ <KeyListEntry name="volume-up" description="Volume up" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/media" />
+ <KeyListEntry name="media" description="Launch media player" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/play" />
+ <KeyListEntry name="play" description="Play (or play/pause)" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/pause" />
+ <KeyListEntry name="pause" description="Pause playback" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/stop" />
+ <KeyListEntry name="stop" description="Stop playback" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/previous" />
+ <KeyListEntry name="previous" description="Previous track" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/next" />
+ <KeyListEntry name="next" description="Next track" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/eject" />
+ <KeyListEntry name="eject" description="Eject" />
</KeyListEntries>
@@ -1,29 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Desktop">
+<KeyListEntries name="Desktop" schema="org.mate.SettingsDaemon.plugins.media-keys" package="mate-settings-daemon">
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/help" />
+ <KeyListEntry name="help" description="Launch help browser" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/calculator" />
+ <KeyListEntry name="calculator" description="Launch calculator" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/email" />
+ <KeyListEntry name="email" description="Launch email client" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/www" />
+ <KeyListEntry name="www" description="Launch web browser" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/power" />
+ <KeyListEntry name="power" description="Log out" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/screensaver" />
+ <KeyListEntry name="screensaver" description="Lock screen" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/home" />
+ <KeyListEntry name="home" description="Home folder" />
- <KeyListEntry
- name="/apps/mate_settings_daemon/keybindings/search" />
+ <KeyListEntry name="search" description="Search" />
</KeyListEntries>
Oops, something went wrong.

0 comments on commit ae46e7d

Please sign in to comment.