[gnome-terminal] build: Drop support for dconf 0.12

[Christian Persch <chpe src gnome org>]

commit 4957837439ffb6fe304324e9ec27d0673786a5f5
Author: Christian Persch <chpe gnome org>
Date:   Fri Dec 27 20:12:01 2013 +0100

    build: Drop support for dconf 0.12

 configure.ac                 |   11 +----------
 src/terminal-settings-list.c |   21 ---------------------
 2 files changed, 1 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea39750..6809a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AM_GLIB_GNU_GETTEXT
 GLIB_REQUIRED=2.39.2
 GIO_REQUIRED=2.33.2
 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.0
-DCONF_REQUIRED=0.12.0
+DCONF_REQUIRED=0.14.0
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
 AC_ARG_WITH([gtk],
@@ -81,15 +81,6 @@ PKG_CHECK_MODULES([TERM],
    uuid
    $PLATFORM_DEPS])
 
-# DConf broke API without changing the pkgconfig name
-AC_MSG_CHECKING([old DConf])
-PKG_CHECK_EXISTS([dconf >= 0.14],[have_old_dconf=no],[have_old_dconf=yes])
-AC_MSG_RESULT([$have_old_dconf])
-
-if test "$have_old_dconf" = "yes"; then
-  AC_DEFINE([HAVE_DCONF_1_2],[1],[Define to 1 if DConf is version 1.2])
-fi
-
 # ****
 # DBus
 # ****
diff --git a/src/terminal-settings-list.c b/src/terminal-settings-list.c
index e0c51aa..1d8248e 100644
--- a/src/terminal-settings-list.c
+++ b/src/terminal-settings-list.c
@@ -267,9 +267,7 @@ clone_child (TerminalSettingsList *list,
   char **keys;
   guint i;
   gs_unref_object DConfClient *client;
-#ifndef HAVE_DCONF_1_2
   DConfChangeset *changeset;
-#endif
 
   new_uuid = new_list_entry ();
 
@@ -279,12 +277,8 @@ clone_child (TerminalSettingsList *list,
   path = path_new (list, uuid);
   new_path = path_new (list, new_uuid);
 
-#ifdef HAVE_DCONF_1_2
-  client = dconf_client_new (NULL, NULL, NULL, NULL);
-#else
   client = dconf_client_new ();
   changeset = dconf_changeset_new ();
-#endif
 
   /* FIXME: this is beyond ugly. Need API on GSettingsSchema to list all the keys! */
   {
@@ -297,27 +291,17 @@ clone_child (TerminalSettingsList *list,
     gs_unref_variant GVariant *value;
 
     rkey = g_strconcat (path, keys[i], NULL);
-#ifdef HAVE_DCONF_1_2
-    value = dconf_client_read_no_default (client, rkey);
-#else
     value = dconf_client_read (client, rkey);
-#endif
 
     if (value) {
       gs_free char *wkey;
       wkey = g_strconcat (new_path, keys[i], NULL);
-#ifdef HAVE_DCONF_1_2
-      dconf_client_write (client, wkey, value, NULL, NULL, NULL);
-#else
       dconf_changeset_set (changeset, wkey, value);
-#endif
     }
   }
 
-#ifndef HAVE_DCONF_1_2
   dconf_client_change_sync (client, changeset, NULL, NULL, NULL);
   dconf_changeset_unref (changeset);
-#endif
 
   return new_uuid;
 }
@@ -370,13 +354,8 @@ terminal_settings_list_remove_child_internal (TerminalSettingsList *list,
   /* Now we unset all keys under the child */
   path = path_new (list, uuid);
 
-#ifdef HAVE_DCONF_1_2
-  client = dconf_client_new (NULL, NULL, NULL, NULL);
-  dconf_client_write (client, path, NULL, NULL, NULL, NULL);
-#else /* modern DConf */
   client = dconf_client_new ();
   dconf_client_write_sync (client, path, NULL, NULL, NULL, NULL);
-#endif
 }
 
 static void