summaryrefslogtreecommitdiff
path: root/xfconfd
diff options
context:
space:
mode:
authorNick Schermer <nick@xfce.org>2011-05-26 21:21:22 +0200
committerNick Schermer <nick@xfce.org>2011-05-26 21:21:36 +0200
commitaf7422ae71b936dbc683a6e19181caffaeeeef86 (patch)
treeb83812e8c275f1eab0d3099127d5a3fd2a818405 /xfconfd
parent158af194f73fbc5b777c7226aee1b1230d5eb7b0 (diff)
downloadxfconf-af7422ae71b936dbc683a6e19181caffaeeeef86.tar.gz
Cleanup includes.
Diffstat (limited to 'xfconfd')
-rw-r--r--xfconfd/Makefile.am3
-rw-r--r--xfconfd/xfconf-backend-perchannel-xml.c4
-rw-r--r--xfconfd/xfconf-daemon.c6
3 files changed, 5 insertions, 8 deletions
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 7a1e66d..e118ee4 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -1,9 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/common \
- -I$(top_builddir) \
- -I$(top_builddir)/common \
-DG_LOG_DOMAIN=\"xfconfd\" \
-DLIBXFCONF_COMPILATION \
-DBINDIR=\"$(bindir)\" \
diff --git a/xfconfd/xfconf-backend-perchannel-xml.c b/xfconfd/xfconf-backend-perchannel-xml.c
index e398d8c..34c40e8 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -57,9 +57,9 @@
#include "xfconf-backend-perchannel-xml.h"
#include "xfconf-backend.h"
#include "xfconf-locking-utils.h"
-#include "xfconf-gvaluefuncs.h"
+#include "common/xfconf-gvaluefuncs.h"
#include "xfconf/xfconf-types.h"
-#include "xfconf-common-private.h"
+#include "common/xfconf-common-private.h"
#define FILE_VERSION_MAJOR "1"
#define FILE_VERSION_MINOR "0"
diff --git a/xfconfd/xfconf-daemon.c b/xfconfd/xfconf-daemon.c
index 17bbd3a..f416e1a 100644
--- a/xfconfd/xfconf-daemon.c
+++ b/xfconfd/xfconf-daemon.c
@@ -29,10 +29,10 @@
#include "xfconf-daemon.h"
#include "xfconf-backend-factory.h"
#include "xfconf-backend.h"
-#include "xfconf-marshal.h"
-#include "xfconf-gvaluefuncs.h"
+#include "common/xfconf-marshal.h"
+#include "common/xfconf-gvaluefuncs.h"
#include "xfconf/xfconf-errors.h"
-#include "xfconf-common-private.h"
+#include "common/xfconf-common-private.h"
static void xfconf_set_property(XfconfDaemon *xfconfd,
const gchar *channel,