From f335d66a7c09ebe0f4b342a2afe84dfbad52ac2e Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Sun, 20 Nov 2016 20:43:20 +0300
Subject: build: require dconf >= 0.13

---
 plugins/keybindings/dconf-util.c              | 12 ------------
 plugins/keybindings/msd-keybindings-manager.c | 15 ---------------
 2 files changed, 27 deletions(-)

(limited to 'plugins/keybindings')

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);
 
-- 
cgit v1.2.1