[gnome-terminal] all: Build against recent version of libdconf
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] all: Build against recent version of libdconf
- Date: Sun, 19 Aug 2012 23:08:18 +0000 (UTC)
commit 658c1b7b8e1afa6d2f523a7acd8e6681b9af6be6
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Aug 20 10:46:15 2012 +1200
all: Build against recent version of libdconf
configure.ac | 3 ++-
src/terminal-app.c | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b8cbf02..7f401e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,7 @@ AM_GLIB_GNU_GETTEXT
GLIB_REQUIRED=2.32.0
GIO_REQUIRED=2.33.2
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.0
+DCONF_REQUIRED=0.13.4
AC_MSG_CHECKING([which gtk+ version to compile against])
AC_ARG_WITH([gtk],
@@ -81,7 +82,7 @@ PKG_CHECK_MODULES([TERM],
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf
+ dconf >= $DCONF_REQUIRED
$PLATFORM_DEPS])
# ****
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 3d175f9..46742df 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -54,8 +54,7 @@
#include <time.h>
#ifdef WITH_DCONF
-#include <dconf-client.h>
-#include <dconf-paths.h>
+#include <dconf.h>
#endif
#define DESKTOP_INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
@@ -1201,7 +1200,7 @@ terminal_app_init (TerminalApp *app)
/* FIXME HACK! */
backend = g_settings_backend_get_default ();
if (strcmp (G_OBJECT_TYPE_NAME (backend), "DConfSettingsBackend") == 0) {
- app->dconf_client = dconf_client_new (NULL, NULL, NULL, NULL);
+ app->dconf_client = dconf_client_new ();
terminal_app_dconf_get_profile_list (app);
}
g_object_unref (backend);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]