daemon: Fix build breakage from previous commit

The trivial fix didn't work because there is now a circular dependency
between the gvfsdaemon.h and and gvfsbackend.h headers.  Break
this by creating the standard "types.h".

https://bugzilla.gnome.org/show_bug.cgi?id=511802

3 files changed, 37 insertions, 2 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e53bd850..6e63464e 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -150,6 +150,7 @@ noinst_PROGRAMS =				\
 	$(NULL)
 
 libdaemon_la_SOURCES = \
+	gvfstypes.h \
 	gvfsdaemon.c gvfsdaemon.h \
 	gvfsbackend.c gvfsbackend.h \
 	gvfschannel.c gvfschannel.h \
diff --git a/daemon/gvfsdaemon.h b/daemon/gvfsdaemon.h
index 91dc5028..d28fb8fe 100644
--- a/daemon/gvfsdaemon.h
+++ b/daemon/gvfsdaemon.h
@@ -25,6 +25,7 @@
 
 #include <glib-object.h>
 #include <gvfsjobsource.h>
+#include <gvfstypes.h>
 #include <gmountsource.h>
 #include <gvfsdbus.h>
 
@@ -37,7 +38,6 @@ G_BEGIN_DECLS
 #define G_VFS_IS_DAEMON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_DAEMON))
 #define G_VFS_DAEMON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_DAEMON, GVfsDaemonClass))
 
-typedef struct _GVfsDaemon        GVfsDaemon;
 typedef struct _GVfsDaemonClass   GVfsDaemonClass;
 typedef struct _GVfsDaemonPrivate GVfsDaemonPrivate;
 
@@ -78,7 +78,8 @@ void        g_vfs_daemon_initiate_mount  (GVfsDaemon                    *daemon,
 GArray     *g_vfs_daemon_get_blocking_processes (GVfsDaemon             *daemon);
 void        g_vfs_daemon_run_job_in_thread      (GVfsDaemon             *daemon,
 						 GVfsJob                *job);
-void       g_vfs_daemon_close_active_channels (GVfsDaemon                *daemon);
+void       g_vfs_daemon_close_active_channels (GVfsDaemon                *daemon,
+					       GVfsBackend *backend);
 
 G_END_DECLS
 
diff --git a/daemon/gvfstypes.h b/daemon/gvfstypes.h
new file mode 100644
index 00000000..d58d2bc1
--- /dev/null
+++ b/daemon/gvfstypes.h
@@ -0,0 +1,33 @@
+/* GIO - GLib Input, Output and Streaming Library
+ * 
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __G_VFS_TYPES_H__
+#define __G_VFS_TYPES_H__
+
+G_BEGIN_DECLS
+
+typedef struct _GVfsBackend       GVfsBackend;
+typedef struct _GVfsDaemon        GVfsDaemon;
+
+G_END_DECLS
+
+#endif /* __G_VFS_TYPES_H__ */
+
+