afp: move definitions of GVfsAfp[Volume|Server] into gvfsafptypes.h

6 files changed, 43 insertions, 5 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e455d66a..218e3b77 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -503,6 +503,7 @@ gvfsd_afp_browse_SOURCES = \
 	gvfsbackendafpbrowse.c gvfsbackendafpbrowse.h \
 	daemon-main.c daemon-main.h \
 	daemon-main-generic.c \
+	gvfsafptypes.h \
 	gvfsafputils.c gvfsafputils.h \
 	gvfsafpconnection.h \
 	gvfsafpconnection.c \
@@ -525,6 +526,7 @@ gvfsd_afp_SOURCES = \
 	gvfsbackendafp.c gvfsbackendafp.h \
 	daemon-main.c daemon-main.h \
 	daemon-main-generic.c \
+	gvfsafptypes.h \
 	gvfsafputils.c gvfsafputils.h \
 	gvfsafpconnection.h \
 	gvfsafpconnection.c \
diff --git a/daemon/gvfsafpserver.c b/daemon/gvfsafpserver.c
index 6c80eb53..74310403 100644
--- a/daemon/gvfsafpserver.c
+++ b/daemon/gvfsafpserver.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "gvfskeyring.h"
+#include "gvfsafpvolume.h"
 
 #include "gvfsafpserver.h"
 
diff --git a/daemon/gvfsafpserver.h b/daemon/gvfsafpserver.h
index f2c22352..46e7368d 100644
--- a/daemon/gvfsafpserver.h
+++ b/daemon/gvfsafpserver.h
@@ -27,7 +27,8 @@
 
 #include "gmountsource.h"
 #include "gvfsafpconnection.h"
-#include "gvfsafpvolume.h"
+
+#include "gvfsafptypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/daemon/gvfsafptypes.h b/daemon/gvfsafptypes.h
new file mode 100644
index 00000000..b95befcb
--- /dev/null
+++ b/daemon/gvfsafptypes.h
@@ -0,0 +1,35 @@
+ /* GIO - GLib Input, Output and Streaming Library
+ * 
+ * Copyright (C) Carl-Anton Ingmarsson 2012 <ca.ingmarsson@gmail.com>
+ *
+ * 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., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
+ */
+
+#ifndef _GVFSAFPTYPES_H_
+#define _GVFSAFPTYPES_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GVfsAfpServer     GVfsAfpServer;
+typedef struct _GVfsAfpVolume     GVfsAfpVolume;
+
+G_END_DECLS
+
+#endif /* _GVFSAFPTYPES_H_ */
\ No newline at end of file
diff --git a/daemon/gvfsafpvolume.h b/daemon/gvfsafpvolume.h
index 86eefa1c..6325e960 100644
--- a/daemon/gvfsafpvolume.h
+++ b/daemon/gvfsafpvolume.h
@@ -23,12 +23,11 @@
 #ifndef _GVFSAFPVOLUME_H_
 #define _GVFSAFPVOLUME_H_
 
-#include <glib-object.h>
+#include "gvfsafptypes.h"
+#include "gvfsafpconnection.h"
 
 G_BEGIN_DECLS
 
-typedef struct _GVfsAfpServer GVfsAfpServer;
-
 #define G_VFS_TYPE_AFP_VOLUME             (g_vfs_afp_volume_get_type ())
 #define G_VFS_AFP_VOLUME(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_VFS_TYPE_AFP_VOLUME, GVfsAfpVolume))
 #define G_VFS_AFP_VOLUME_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), G_VFS_TYPE_AFP_VOLUME, GVfsAfpVolumeClass))
@@ -37,7 +36,6 @@ typedef struct _GVfsAfpServer GVfsAfpServer;
 #define G_VFS_AFP_VOLUME_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), G_VFS_TYPE_AFP_VOLUME, GVfsAfpVolumeClass))
 
 typedef struct _GVfsAfpVolumeClass GVfsAfpVolumeClass;
-typedef struct _GVfsAfpVolume GVfsAfpVolume;
 typedef struct _GVfsAfpVolumePrivate GVfsAfpVolumePrivate;
 
 struct _GVfsAfpVolumeClass
diff --git a/daemon/gvfsbackendafp.c b/daemon/gvfsbackendafp.c
index 030a14c2..07274862 100644
--- a/daemon/gvfsbackendafp.c
+++ b/daemon/gvfsbackendafp.c
@@ -54,6 +54,7 @@
 #include "gvfsjobcopy.h"
 
 #include "gvfsafpserver.h"
+#include "gvfsafpvolume.h"
 
 #include "gvfsbackendafp.h"