diff options
| -rw-r--r-- | capplets/common/dconf-util.c | 12 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 1 insertions, 18 deletions
diff --git a/capplets/common/dconf-util.c b/capplets/common/dconf-util.c index 4987a34b..10dd4e95 100644 --- a/capplets/common/dconf-util.c +++ b/capplets/common/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/configure.ac b/configure.ac index b2e3f756..1e77a942 100644 --- a/configure.ac +++ b/configure.ac @@ -169,12 +169,7 @@ PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.36 gio-2.0 gtk+-$GTK_API_VER PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= 1.13.1) PKG_CHECK_MODULES(GIO, gio-2.0) -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]) - ]) -]) +PKG_CHECK_MODULES([DCONF], [dconf >= 0.13.4]) AC_SUBST(DCONF_CFLAGS) AC_SUBST(DCONF_LIBS) |