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 /common | |
| 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 'common')
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | common/gmountoperationdbus.c | 2 | ||||
| -rw-r--r-- | common/gmountsource.c | 2 | ||||
| -rw-r--r-- | common/gmountspec.c | 2 | ||||
| -rw-r--r-- | common/gmounttracker.c | 2 | ||||
| -rw-r--r-- | common/gvfsdaemonprotocol.c | 2 | ||||
| -rw-r--r-- | common/gvfsdbusutils.c (renamed from common/gdbusutils.c) | 2 | ||||
| -rw-r--r-- | common/gvfsdbusutils.h (renamed from common/gdbusutils.h) | 6 |
8 files changed, 10 insertions, 10 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index ccece5ee..7204a2aa 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 9122042e..b192b7e0 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 5ee964ea..539ceda9 100644 --- a/common/gmountsource.c +++ b/common/gmountsource.c @@ -23,7 +23,7 @@ #include <config.h> #include <gmountsource.h> -#include <gdbusutils.h> +#include <gvfsdbusutils.h> #include <gio/gio.h> #include <gvfsdaemonprotocol.h> diff --git a/common/gmountspec.c b/common/gmountspec.c index 1a9a60a6..8536ddce 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 2b5147a2..9c7af7b4 100644 --- a/common/gmounttracker.c +++ b/common/gmounttracker.c @@ -25,7 +25,7 @@ #include <string.h> #include <gmounttracker.h> -#include <gdbusutils.h> +#include <gvfsdbusutils.h> #include <gvfsdaemonprotocol.h> enum { diff --git a/common/gvfsdaemonprotocol.c b/common/gvfsdaemonprotocol.c index 7feefeb9..4185c52b 100644 --- a/common/gvfsdaemonprotocol.c +++ b/common/gvfsdaemonprotocol.c @@ -26,7 +26,7 @@ #include <dbus/dbus.h> #include <glib/gi18n-lib.h> #include <gvfsdaemonprotocol.h> -#include <gdbusutils.h> +#include <gvfsdbusutils.h> #include <gio/gio.h> static const char * diff --git a/common/gdbusutils.c b/common/gvfsdbusutils.c index f9d18894..9945ba81 100644 --- a/common/gdbusutils.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/gdbusutils.h b/common/gvfsdbusutils.h index 1a94330b..a79723d5 100644 --- a/common/gdbusutils.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__ */ |