Commit af2fcaeb authored by Nick Schermer's avatar Nick Schermer

Port settings to xfconf.

Loading over DBus is a tiny bit slower, but makes
it a lot easier to change values and also saves a
lot of hassle with modified properties.
parent 6b991272
......@@ -147,6 +147,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
dnl ********************************************
dnl *** Check for session management support ***
......
......@@ -226,6 +226,7 @@ thunar_CFLAGS = \
$(LIBSM_CFLAGS) \
$(LIBSTARTUP_NOTIFICATION_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(XFCONF_CFLAGS) \
$(PLATFORM_CFLAGS)
thunar_LDFLAGS = \
......@@ -242,7 +243,8 @@ thunar_LDADD = \
$(LIBNOTIFY_LIBS) \
$(LIBSM_LIBS) \
$(LIBSTARTUP_NOTIFICATION_LIBS) \
$(LIBXFCE4UI_LIBS)
$(LIBXFCE4UI_LIBS) \
$(XFCONF_LIBS)
thunar_DEPENDENCIES = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
......
......@@ -33,6 +33,8 @@
#include <gio/gdesktopappinfo.h>
#endif
#include <xfconf/xfconf.h>
#ifdef HAVE_LIBNOTIFY
#include <thunar/thunar-notify.h>
#endif
......@@ -172,6 +174,14 @@ main (int argc, char **argv)
return EXIT_SUCCESS;
}
/* initialize xfconf */
if (!xfconf_init (&error))
{
g_critical ("Failed to initialize Xfconf: %s", error->message);
g_error_free (error);
return EXIT_FAILURE;
}
#ifdef HAVE_GIO_UNIX
/* set desktop environment for app infos */
g_desktop_app_info_set_desktop_env ("XFCE");
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment