diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | plugins/keybindings/dconf-util.c | 12 | ||||
| -rw-r--r-- | plugins/keybindings/msd-keybindings-manager.c | 15 |
3 files changed, 1 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 5747f7c..03d782a 100644 --- a/configure.ac +++ b/configure.ac @@ -119,14 +119,7 @@ case $host_os in esac AC_SUBST([MSD_PLUGIN_LDFLAGS]) -PKG_CHECK_MODULES([DCONF], [dconf >= 0.13.4], - [AC_DEFINE([HAVE_DCONF_0_13], [1], [Use DCONF >= 0.13.4])], - [PKG_CHECK_MODULES([DCONF], [dconf >= 0.10.0], - [AC_DEFINE([HAVE_DCONF_0_10], [1], [Use DCONF 0.10.0]) - ]) -]) -AC_SUBST(DCONF_CFLAGS) -AC_SUBST(DCONF_LIBS) +PKG_CHECK_MODULES(DCONF, dconf >= 0.13.4) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) diff --git a/plugins/keybindings/dconf-util.c b/plugins/keybindings/dconf-util.c index 4987a34..10dd4e9 100644 --- a/plugins/keybindings/dconf-util.c +++ b/plugins/keybindings/dconf-util.c @@ -36,11 +36,7 @@ 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 @@ -51,11 +47,7 @@ dconf_util_write_sync (const gchar *key, 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); @@ -69,11 +61,7 @@ dconf_util_recursive_reset (const gchar *dir, 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); diff --git a/plugins/keybindings/msd-keybindings-manager.c b/plugins/keybindings/msd-keybindings-manager.c index ce07889..738e75a 100644 --- a/plugins/keybindings/msd-keybindings-manager.c +++ b/plugins/keybindings/msd-keybindings-manager.c @@ -521,14 +521,8 @@ keybindings_filter (GdkXEvent *gdk_xevent, static void bindings_callback (DConfClient *client, - #ifdef HAVE_DCONF_0_13 gchar *prefix, GStrv changes, - #else - const gchar *path, - const gchar * const *items, - gint n_items, - #endif gchar *tag, MsdKeybindingsManager *manager) { @@ -568,18 +562,9 @@ msd_keybindings_manager_start (MsdKeybindingsManager *manager, bindings_get_entries (manager); binding_register_keys (manager); - /* DConf has different API between versions: - * http://developer.gnome.org/dconf/0.12/DConfClient.html - * http://developer.gnome.org/dconf/0.14/DConfClient.html - */ - #ifdef HAVE_DCONF_0_13 manager->priv->client = dconf_client_new (); dconf_client_watch_fast (manager->priv->client, GSETTINGS_KEYBINDINGS_DIR); g_signal_connect (manager->priv->client, "changed", G_CALLBACK (bindings_callback), manager); - #else - manager->priv->client = dconf_client_new (NULL, (DConfWatchFunc) bindings_callback, manager, NULL); - dconf_client_watch (manager->priv->client, GSETTINGS_KEYBINDINGS_DIR, NULL, NULL); - #endif mate_settings_profile_end (NULL); |