diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-26 23:58:13 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-27 00:00:56 -0400 |
| commit | e564f383f2f1cf140acee71371dda3a3a83bb935 (patch) | |
| tree | 3adb045b86bb924eb065fd7646e088cd92803e67 /client | |
| parent | f2e5a2c33a407ec44c033edbe58780ca0148ac70 (diff) | |
| download | gvfs-e564f383f2f1cf140acee71371dda3a3a83bb935.tar.gz | |
Rename gdbusutils.h to avoid conflict with GIO1.6.2
This makes gvfs build with recent glib again, see bug #619537
Diffstat (limited to 'client')
| -rw-r--r-- | client/gdaemonfile.c | 2 | ||||
| -rw-r--r-- | client/gdaemonfilemonitor.c | 2 | ||||
| -rw-r--r-- | client/gdaemonmount.c | 2 | ||||
| -rw-r--r-- | client/gdaemonvfs.c | 2 | ||||
| -rw-r--r-- | client/gvfsdaemondbus.c | 2 | ||||
| -rw-r--r-- | client/gvfsfusedaemon.c | 2 | ||||
| -rw-r--r-- | client/gvfsiconloadable.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index e55830aa..58f22308 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 851907a9..20c10f92 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 1f0e4c2e..f5bc5a62 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 96a65e88..59131b09 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 0999eb09..2f999eed 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/gvfsfusedaemon.c b/client/gvfsfusedaemon.c index 720af3bf..13cb74d1 100644 --- a/client/gvfsfusedaemon.c +++ b/client/gvfsfusedaemon.c @@ -46,7 +46,7 @@ /* stuff from common/ */ #include <gdaemonmount.h> #include <gvfsdaemonprotocol.h> -#include <gdbusutils.h> +#include <gvfsdbusutils.h> #define FUSE_USE_VERSION 26 #include <fuse.h> diff --git a/client/gvfsiconloadable.c b/client/gvfsiconloadable.c index 50af5809..0660b303 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 */ |