summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac13
-rw-r--r--libmate-desktop/mate-dconf.c14
2 files changed, 4 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 0f40b76..470f07f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,15 +164,10 @@ dnl ----------------------------------------------------------------------------
dnl DCONF
dnl ----------------------------------------------------------------------------
-DCONF_NEW_REQUIRED=0.13.4
-DCONF_OLD_REQUIRED=0.10.0
-
-PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED],
- [AC_DEFINE([HAVE_DCONF_0_13], [1], [Use DCONF >= $DCONF_NEW_REQUIRED])],
- [PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_OLD_REQUIRED],
- [AC_DEFINE([HAVE_DCONF_0_10], [1], [Use DCONF $DCONF_OLD_REQUIRED])
- ])
-])
+DCONF_REQUIRED=0.13.4
+
+PKG_CHECK_MODULES(DCONF, dconf >= $DCONF_REQUIRED)
+
AC_SUBST(DCONF_CFLAGS)
AC_SUBST(DCONF_LIBS)
diff --git a/libmate-desktop/mate-dconf.c b/libmate-desktop/mate-dconf.c
index 3820162..bffafbd 100644
--- a/libmate-desktop/mate-dconf.c
+++ b/libmate-desktop/mate-dconf.c
@@ -37,11 +37,7 @@
static DConfClient *
mate_dconf_client_get (void)
{
-#ifdef HAVE_DCONF_0_13
return dconf_client_new ();
-#else
- return dconf_client_new (NULL, NULL, NULL, NULL);
-#endif
}
/**
@@ -62,11 +58,7 @@ mate_dconf_write_sync (const gchar *key,
gboolean ret;
DConfClient *client = mate_dconf_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);
@@ -89,11 +81,7 @@ mate_dconf_recursive_reset (const gchar *dir,
gboolean ret;
DConfClient *client = mate_dconf_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);
@@ -153,9 +141,7 @@ mate_dconf_list_subdirs (const gchar *dir,
*/
void mate_dconf_sync (void)
{
-#ifdef HAVE_DCONF_0_13
DConfClient *client = mate_dconf_client_get ();
dconf_client_sync (client);
g_object_unref (client);
-#endif
}