Patch to fix gvfs build issues after GDbus was merged into GLib

From: Kjartan Maraas <kmaraas broadpark no>
To: Nautilus List <nautilus-list gnome org>
Subject: Patch to fix gvfs build issues after GDbus was merged into GLib
Date: Wed, 26 May 2010 21:22:20 +0200

Hi.

I had problems building gvfs against newer glib versions because both
contain gdbusutils.[ch].

Here's a patch that made it compile for me at least.

Move the two offending files to gvfsdbusutils.[ch] and adjust the rest
of the code accordingly.

Cheers
Kjartan

diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index e55830a..58f2230 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -37,7 +37,7 @@
 #include <gdaemonfilemonitor.h>
 #include <gdaemonfileenumerator.h>
 #include <glib/gi18n-lib.h>
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gmountoperationdbus.h"
 #include <gio/gio.h>
 #include "metatree.h"
diff --git a/client/gdaemonfilemonitor.c b/client/gdaemonfilemonitor.c
index 851907a..20c10f9 100644
--- a/client/gdaemonfilemonitor.c
+++ b/client/gdaemonfilemonitor.c
@@ -27,7 +27,7 @@
 #include <gio/gio.h>
 #include <gvfsdaemondbus.h>
 #include <gvfsdaemonprotocol.h>
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gmountspec.h"
 #include "gdaemonfile.h"
 
diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
index 1f0e4c2..f5bc5a6 100644
--- a/client/gdaemonmount.c
+++ b/client/gdaemonmount.c
@@ -32,7 +32,7 @@
 #include "gvfsdaemondbus.h"
 #include "gdaemonfile.h"
 #include "gvfsdaemonprotocol.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gmountsource.h"
 #include "gmountoperationdbus.h"
 
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 96a65e8..59131b0 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -33,7 +33,7 @@
 #include <gvfsdaemonprotocol.h>
 #include <gmodule.h>
 #include "gvfsdaemondbus.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gmountspec.h"
 #include "gvfsurimapper.h"
 #include "gdaemonvolumemonitor.h"
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c
index 0999eb0..2f999ee 100644
--- a/client/gvfsdaemondbus.c
+++ b/client/gvfsdaemondbus.c
@@ -36,7 +36,7 @@
 #include "gvfsdaemondbus.h"
 #include <gvfsdaemonprotocol.h>
 #include <gdaemonvfs.h>
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gsysutils.h"
 
 /* Extra vfs-specific data for DBusConnections */
diff --git a/client/gvfsiconloadable.c b/client/gvfsiconloadable.c
index 50af580..0660b30 100644
--- a/client/gvfsiconloadable.c
+++ b/client/gvfsiconloadable.c
@@ -31,7 +31,7 @@
 #include "gdaemonvfs.h"
 #include "gdaemonfileinputstream.h"
 #include "gvfsdaemonprotocol.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 
 /* see comment in common/giconvfs.c for why the GLoadableIcon interface is here */
 
diff --git a/common/Makefile.am b/common/Makefile.am
index ccece5e..7204a2a 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
 
 libgvfscommon_la_SOURCES = 	\
 	gsysutils.c gsysutils.h \
-	gdbusutils.c gdbusutils.h \
+	gvfsdbusutils.c gvfsdbusutils.h \
 	gmountspec.c gmountspec.h \
 	gmountoperationdbus.c gmountoperationdbus.h \
 	gmountsource.c gmountsource.h \
diff --git a/common/gmountoperationdbus.c b/common/gmountoperationdbus.c
index 9122042..b192b7e 100644
--- a/common/gmountoperationdbus.c
+++ b/common/gmountoperationdbus.c
@@ -31,7 +31,7 @@
 #include <gio/gio.h>
 #include "gmountoperationdbus.h"
 #include "gvfsdaemonprotocol.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include <glib/gi18n-lib.h>
 
 typedef struct 
diff --git a/common/gmountsource.c b/common/gmountsource.c
index 5ee964e..ac6a321 100644
--- a/common/gmountsource.c
+++ b/common/gmountsource.c
@@ -22,10 +22,10 @@
 
 #include <config.h>
 
-#include <gmountsource.h>
-#include <gdbusutils.h>
+#include "gmountsource.h"
+#include "gvfsdbusutils.h"
 #include <gio/gio.h>
-#include <gvfsdaemonprotocol.h>
+#include "gvfsdaemonprotocol.h"
 
 struct _GMountSource
 {
diff --git a/common/gmountspec.c b/common/gmountspec.c
index 1a9a60a..8536ddc 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gmountspec.h"
 
 static GHashTable *unique_hash = NULL;
diff --git a/common/gmounttracker.c b/common/gmounttracker.c
index 2b5147a..c100bee 100644
--- a/common/gmounttracker.c
+++ b/common/gmounttracker.c
@@ -24,9 +24,9 @@
 
 #include <string.h>
 
-#include <gmounttracker.h>
-#include <gdbusutils.h>
-#include <gvfsdaemonprotocol.h>
+#include "gmounttracker.h"
+#include "gvfsdbusutils.h"
+#include "gvfsdaemonprotocol.h"
 
 enum {
   MOUNTED,
diff --git a/common/gmounttracker.h b/common/gmounttracker.h
index 4892baa..6b1624f 100644
--- a/common/gmounttracker.h
+++ b/common/gmounttracker.h
@@ -25,7 +25,7 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-#include <gmountspec.h>
+#include "gmountspec.h"
 
 G_BEGIN_DECLS
 
diff --git a/common/gvfsdaemonprotocol.c b/common/gvfsdaemonprotocol.c
index 7feefeb..b62e259 100644
--- a/common/gvfsdaemonprotocol.c
+++ b/common/gvfsdaemonprotocol.c
@@ -25,8 +25,8 @@
 #include <glib-object.h>
 #include <dbus/dbus.h>
 #include <glib/gi18n-lib.h>
-#include <gvfsdaemonprotocol.h>
-#include <gdbusutils.h>
+#include "gvfsdaemonprotocol.h"
+#include "gvfsdbusutils.h"
 #include <gio/gio.h>
 
 static const char *
diff --git a/common/gvfsdbusutils.c b/common/gvfsdbusutils.c
index f9d1889..9664c0c 100644
--- a/common/gvfsdbusutils.c
+++ b/common/gvfsdbusutils.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 #include <gio/gio.h>
 
 void
diff --git a/common/gvfsdbusutils.h b/common/gvfsdbusutils.h
index 1a94330..a79723d 100644
--- a/common/gvfsdbusutils.h
+++ b/common/gvfsdbusutils.h
@@ -20,8 +20,8 @@
  * Author: Alexander Larsson <alexl redhat com>
  */
 
-#ifndef __G_DBUS_UTILS_H__
-#define __G_DBUS_UTILS_H__
+#ifndef __GVFS_DBUS_UTILS_H__
+#define __GVFS_DBUS_UTILS_H__
 
 #include <glib.h>
 #include <dbus/dbus.h>
@@ -92,4 +92,4 @@ void        _g_dbus_connection_call_async           (DBusConnection *connection,
 G_END_DECLS
 
 
-#endif /* __G_DBUS_UTILS_H__ */
+#endif /* __GVFS_DBUS_UTILS_H__ */
diff --git a/daemon/gvfsbackend.c b/daemon/gvfsbackend.c
index 0d13b1b..10f4d66 100644
--- a/daemon/gvfsbackend.c
+++ b/daemon/gvfsbackend.c
@@ -58,7 +58,7 @@
 #include <gvfsjobpull.h>
 #include <gvfsjobsetattribute.h>
 #include <gvfsjobqueryattributes.h>
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 enum {
   PROP_0,
diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h
index 88fd97b..4b4482a 100644
--- a/daemon/gvfsbackend.h
+++ b/daemon/gvfsbackend.h
@@ -28,7 +28,7 @@
 #include <gvfsdaemon.h>
 #include <gvfsjob.h>
 #include <gmountspec.h>
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 G_BEGIN_DECLS
 
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
index 909e1d7..5a3cd61 100644
--- a/daemon/gvfsdaemon.c
+++ b/daemon/gvfsdaemon.c
@@ -42,7 +42,7 @@
 #include <gvfsjobmount.h>
 #include <gvfsjobopenforread.h>
 #include <gvfsjobopenforwrite.h>
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 enum {
   PROP_0
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c
index b221fdb..13f77c7 100644
--- a/daemon/gvfsdaemonutils.c
+++ b/daemon/gvfsdaemonutils.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 
 #include <gio/gio.h>
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gsysutils.h"
 #include "gvfsdaemonutils.h"
 #include "gvfsdaemonprotocol.h"
diff --git a/daemon/gvfsjobcopy.c b/daemon/gvfsjobcopy.c
index 59bb693..730e1e2 100644
--- a/daemon/gvfsjobcopy.c
+++ b/daemon/gvfsjobcopy.c
@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobcopy.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobCopy, g_vfs_job_copy, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobcreatemonitor.c b/daemon/gvfsjobcreatemonitor.c
index 4878373..074a866 100644
--- a/daemon/gvfsjobcreatemonitor.c
+++ b/daemon/gvfsjobcreatemonitor.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobcreatemonitor.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobCreateMonitor, g_vfs_job_create_monitor, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobdbus.c b/daemon/gvfsjobdbus.c
index 3a1bf4e..a95ab30 100644
--- a/daemon/gvfsjobdbus.c
+++ b/daemon/gvfsjobdbus.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobdbus.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 
 G_DEFINE_TYPE (GVfsJobDBus, g_vfs_job_dbus, G_VFS_TYPE_JOB)
 
diff --git a/daemon/gvfsjobdelete.c b/daemon/gvfsjobdelete.c
index b65ec29..688e604 100644
--- a/daemon/gvfsjobdelete.c
+++ b/daemon/gvfsjobdelete.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobdelete.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobDelete, g_vfs_job_delete, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c
index 01678e3..90ff452 100644
--- a/daemon/gvfsjobenumerate.c
+++ b/daemon/gvfsjobenumerate.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobenumerate.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobEnumerate, g_vfs_job_enumerate, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobmakedirectory.c b/daemon/gvfsjobmakedirectory.c
index 2e16b12..2e9c7e2 100644
--- a/daemon/gvfsjobmakedirectory.c
+++ b/daemon/gvfsjobmakedirectory.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmakedirectory.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobMakeDirectory, g_vfs_job_make_directory, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobmakesymlink.c b/daemon/gvfsjobmakesymlink.c
index 898010f..157e70f 100644
--- a/daemon/gvfsjobmakesymlink.c
+++ b/daemon/gvfsjobmakesymlink.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmakesymlink.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobMakeSymlink, g_vfs_job_make_symlink, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobmount.c b/daemon/gvfsjobmount.c
index d5196a9..27b2ef3 100644
--- a/daemon/gvfsjobmount.c
+++ b/daemon/gvfsjobmount.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmount.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobMount, g_vfs_job_mount, G_VFS_TYPE_JOB)
diff --git a/daemon/gvfsjobmountmountable.c b/daemon/gvfsjobmountmountable.c
index 4397bc1..1d60836 100644
--- a/daemon/gvfsjobmountmountable.c
+++ b/daemon/gvfsjobmountmountable.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmountmountable.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobMountMountable, g_vfs_job_mount_mountable, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobmove.c b/daemon/gvfsjobmove.c
index f90deee..0f3b7a2 100644
--- a/daemon/gvfsjobmove.c
+++ b/daemon/gvfsjobmove.c
@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmove.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobMove, g_vfs_job_move, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobopenforread.c b/daemon/gvfsjobopenforread.c
index a2abbeb..31265db 100644
--- a/daemon/gvfsjobopenforread.c
+++ b/daemon/gvfsjobopenforread.c
@@ -32,7 +32,7 @@
 #include <glib/gi18n.h>
 #include "gvfsreadchannel.h"
 #include "gvfsjobopenforread.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobOpenForRead, g_vfs_job_open_for_read, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobopenforwrite.c b/daemon/gvfsjobopenforwrite.c
index 48ec026..6d368f8 100644
--- a/daemon/gvfsjobopenforwrite.c
+++ b/daemon/gvfsjobopenforwrite.c
@@ -32,7 +32,7 @@
 #include <glib/gi18n.h>
 #include "gvfswritechannel.h"
 #include "gvfsjobopenforwrite.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobOpenForWrite, g_vfs_job_open_for_write, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobopeniconforread.c b/daemon/gvfsjobopeniconforread.c
index 8793676..95287c5 100644
--- a/daemon/gvfsjobopeniconforread.c
+++ b/daemon/gvfsjobopeniconforread.c
@@ -32,7 +32,7 @@
 #include <glib/gi18n.h>
 #include "gvfsreadchannel.h"
 #include "gvfsjobopeniconforread.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobOpenIconForRead, g_vfs_job_open_icon_for_read, G_VFS_TYPE_JOB_OPEN_FOR_READ)
diff --git a/daemon/gvfsjobpollmountable.c b/daemon/gvfsjobpollmountable.c
index f4c9898..4fa67b1 100644
--- a/daemon/gvfsjobpollmountable.c
+++ b/daemon/gvfsjobpollmountable.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobpollmountable.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobPollMountable, g_vfs_job_poll_mountable, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobpull.c b/daemon/gvfsjobpull.c
index 175a3e5..4d66bf0 100644
--- a/daemon/gvfsjobpull.c
+++ b/daemon/gvfsjobpull.c
@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobpull.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobPull, g_vfs_job_pull, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobpush.c b/daemon/gvfsjobpush.c
index 62c1638..49680b3 100644
--- a/daemon/gvfsjobpush.c
+++ b/daemon/gvfsjobpush.c
@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobpush.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobPush, g_vfs_job_push, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobqueryattributes.c b/daemon/gvfsjobqueryattributes.c
index aeeeafe..426a26b 100644
--- a/daemon/gvfsjobqueryattributes.c
+++ b/daemon/gvfsjobqueryattributes.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmove.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 #include "gvfsjobqueryattributes.h"
 
diff --git a/daemon/gvfsjobqueryfsinfo.c b/daemon/gvfsjobqueryfsinfo.c
index a5d369c..cce7ded 100644
--- a/daemon/gvfsjobqueryfsinfo.c
+++ b/daemon/gvfsjobqueryfsinfo.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobqueryfsinfo.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobQueryFsInfo, g_vfs_job_query_fs_info, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobqueryinfo.c b/daemon/gvfsjobqueryinfo.c
index 78bf160..3a52539 100644
--- a/daemon/gvfsjobqueryinfo.c
+++ b/daemon/gvfsjobqueryinfo.c
@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobqueryinfo.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobQueryInfo, g_vfs_job_query_info, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobsetattribute.c b/daemon/gvfsjobsetattribute.c
index 264a536..c908216 100644
--- a/daemon/gvfsjobsetattribute.c
+++ b/daemon/gvfsjobsetattribute.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobmove.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 #include "gvfsjobsetattribute.h"
 
diff --git a/daemon/gvfsjobsetdisplayname.c b/daemon/gvfsjobsetdisplayname.c
index e3dd22d..9ac10a3 100644
--- a/daemon/gvfsjobsetdisplayname.c
+++ b/daemon/gvfsjobsetdisplayname.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobsetdisplayname.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobSetDisplayName, g_vfs_job_set_display_name, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobstartmountable.c b/daemon/gvfsjobstartmountable.c
index 508f7f9..e862846 100644
--- a/daemon/gvfsjobstartmountable.c
+++ b/daemon/gvfsjobstartmountable.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobstartmountable.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobStartMountable, g_vfs_job_start_mountable, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobstopmountable.c b/daemon/gvfsjobstopmountable.c
index d2a2c09..31f480a 100644
--- a/daemon/gvfsjobstopmountable.c
+++ b/daemon/gvfsjobstopmountable.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobstopmountable.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobStopMountable, g_vfs_job_stop_mountable, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobtrash.c b/daemon/gvfsjobtrash.c
index 4869ee3..e6f6388 100644
--- a/daemon/gvfsjobtrash.c
+++ b/daemon/gvfsjobtrash.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobtrash.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobTrash, g_vfs_job_trash, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobunmount.c b/daemon/gvfsjobunmount.c
index 142a5a6..ee2cb7e 100644
--- a/daemon/gvfsjobunmount.c
+++ b/daemon/gvfsjobunmount.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobunmount.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonprotocol.h"
 
 G_DEFINE_TYPE (GVfsJobUnmount, g_vfs_job_unmount, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/gvfsjobunmountmountable.c b/daemon/gvfsjobunmountmountable.c
index 2599fcd..ed648ca 100644
--- a/daemon/gvfsjobunmountmountable.c
+++ b/daemon/gvfsjobunmountmountable.c
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <glib/gi18n.h>
 #include "gvfsjobunmountmountable.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsdaemonutils.h"
 
 G_DEFINE_TYPE (GVfsJobUnmountMountable, g_vfs_job_unmount_mountable, G_VFS_TYPE_JOB_DBUS)
diff --git a/daemon/mount.c b/daemon/mount.c
index c995f3b..9f0c873 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -32,7 +32,7 @@
 #include "mount.h"
 #include "gmountoperationdbus.h"
 #include "gvfsdaemonprotocol.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include <glib.h>
 #include <gio/gio.h>
 
diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c
index d4c5ab3..0e21696 100644
--- a/metadata/meta-daemon.c
+++ b/metadata/meta-daemon.c
@@ -28,7 +28,7 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <dbus/dbus.h>
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "metatree.h"
 #include "gvfsdaemonprotocol.h"
 
diff --git a/metadata/meta-set.c b/metadata/meta-set.c
index e3d115d..22af1fc 100644
--- a/metadata/meta-set.c
+++ b/metadata/meta-set.c
@@ -3,7 +3,7 @@
 #include <glib/gstdio.h>
 #include <dbus/dbus.h>
 #include "gvfsdaemonprotocol.h"
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 
 static gboolean unset = FALSE;
 static gboolean list = FALSE;
diff --git a/monitor/proxy/gproxydrive.c b/monitor/proxy/gproxydrive.c
index 796581a..683b502 100644
--- a/monitor/proxy/gproxydrive.c
+++ b/monitor/proxy/gproxydrive.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 #include "gproxyvolumemonitor.h"
 #include "gproxydrive.h"
diff --git a/monitor/proxy/gproxymount.c b/monitor/proxy/gproxymount.c
index 39d31d2..f1f6676 100644
--- a/monitor/proxy/gproxymount.c
+++ b/monitor/proxy/gproxymount.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 #include "gproxyvolumemonitor.h"
 #include "gproxymount.h"
diff --git a/monitor/proxy/gproxymountoperation.c b/monitor/proxy/gproxymountoperation.c
index 5e8620c..e36e0e5 100644
--- a/monitor/proxy/gproxymountoperation.c
+++ b/monitor/proxy/gproxymountoperation.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 #include "gproxymountoperation.h"
 
diff --git a/monitor/proxy/gproxyshadowmount.c b/monitor/proxy/gproxyshadowmount.c
index 328d3d6..3005e0d 100644
--- a/monitor/proxy/gproxyshadowmount.c
+++ b/monitor/proxy/gproxyshadowmount.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 #include "gproxyvolumemonitor.h"
 #include "gproxyshadowmount.h"
diff --git a/monitor/proxy/gproxyvolume.c b/monitor/proxy/gproxyvolume.c
index 484939a..779f866 100644
--- a/monitor/proxy/gproxyvolume.c
+++ b/monitor/proxy/gproxyvolume.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 #include "gproxydrive.h"
 #include "gproxyvolume.h"
diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
index cacb896..553f215 100644
--- a/monitor/proxy/gproxyvolumemonitor.c
+++ b/monitor/proxy/gproxyvolumemonitor.c
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
-#include <gdbusutils.h>
+#include "gvfsdbusutils.h"
 
 #include "gproxyvolumemonitor.h"
 #include "gproxymount.h"
diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
index ddb7d93..0a7e1da 100644
--- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c
+++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <glib/gprintf.h>
 
-#include "gdbusutils.h"
+#include "gvfsdbusutils.h"
 #include "gvfsproxyvolumemonitordaemon.h"
 
 /* ---------------------------------------------------------------------------------------------------- */

Follow-Ups:
- Re: Patch to fix gvfs build issues after GDbus was merged into GLib
  - From: Matthias Clasen

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]