Rename GVfsDaemon to GVfsImplDaemon in the client to avoid name clashes

Original git commit by Alexander Larsson <alex@greebo.(none)> at 1165492470 +0100

svn path=/trunk/; revision=218

7 files changed, 192 insertions, 157 deletions

diff --git a/daemon/test.c b/daemon/test.c
new file mode 100644
index 00000000..f4ab2129
--- /dev/null
+++ b/daemon/test.c
@@ -0,0 +1,35 @@
+#include <config.h>
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus-gmain.h>
+#include "gvfsdaemon.h"
+#include "gvfsbackendtest.h"
+#include <gvfsdaemonprotocol.h>
+
+int
+main (int argc, char *argv[])
+{
+  GMainLoop *loop;
+  GVfsDaemon *daemon;
+  GVfsBackendTest *backend;
+
+  g_thread_init (NULL);
+
+  g_type_init ();
+
+  daemon = g_vfs_daemon_new (FALSE, FALSE);
+  if (daemon == NULL)
+    return 1;
+
+  backend = g_vfs_backend_test_new ();
+  g_vfs_backend_register_with_daemon (G_VFS_BACKEND (backend), daemon);
+  g_object_unref (backend);
+  
+  loop = g_main_loop_new (NULL, FALSE);
+
+  g_print ("Entering mainloop\n");
+  g_main_loop_run (loop);
+  
+  return 0;
+}
diff --git a/gvfs/Makefile.am b/gvfs/Makefile.am
index 2292e1aa..20b8e558 100644
--- a/gvfs/Makefile.am
+++ b/gvfs/Makefile.am
@@ -36,7 +36,7 @@ local_sources = \
 	$(NULL)
 
 daemon_sources = \
-	gvfsdaemon.c gvfsdaemon.h \
+	gvfsimpldaemon.c gvfsimpldaemon.h \
 	gfiledaemon.c gfiledaemon.h \
 	gfiledaemonlocal.c gfiledaemonlocal.h \
 	gvfsuriutils.c gvfsuriutils.h \
diff --git a/gvfs/gvfs.c b/gvfs/gvfs.c
index 4fa81ebe..9d62e3ee 100644
--- a/gvfs/gvfs.c
+++ b/gvfs/gvfs.c
@@ -1,7 +1,7 @@
 #include <config.h>
 #include "gvfs.h"
 #include "gvfslocal.h"
-#include "gvfsdaemon.h"
+#include "gvfsimpldaemon.h"
 #include <glib/gi18n-lib.h>
 
 static void g_vfs_base_init (gpointer g_class);
@@ -80,7 +80,7 @@ get_default_vfs (gpointer arg)
   if (g_getenv ("VFS_USE_LOCAL") != NULL)
     return g_vfs_local_new ();
   else
-    return g_vfs_daemon_new ();
+    return g_vfs_impl_daemon_new ();
 }
 
 GVfs *
diff --git a/gvfs/gvfsdaemon.c b/gvfs/gvfsdaemon.c
deleted file mode 100644
index 3b01117d..00000000
--- a/gvfs/gvfsdaemon.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include <config.h>
-#include <string.h>
-#include "gvfsdaemon.h"
-#include "gvfsuriutils.h"
-#include "gfiledaemon.h"
-#include "gfiledaemonlocal.h"
-#include "gvfslocal.h"
-
-static void g_vfs_daemon_class_init     (GVfsDaemonClass *class);
-static void g_vfs_daemon_vfs_iface_init (GVfsIface       *iface);
-static void g_vfs_daemon_finalize       (GObject         *object);
-
-struct _GVfsDaemon
-{
-  GObject parent;
-
-  GVfs *wrapped_vfs;
-};
-
-G_DEFINE_TYPE_WITH_CODE (GVfsDaemon, g_vfs_daemon, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (G_TYPE_VFS,
-						g_vfs_daemon_vfs_iface_init))
- 
-static void
-g_vfs_daemon_class_init (GVfsDaemonClass *class)
-{
-  GObjectClass *object_class;
-  
-  object_class = (GObjectClass *) class;
-
-  object_class->finalize = g_vfs_daemon_finalize;
-}
-
-static void
-g_vfs_daemon_finalize (GObject *object)
-{
-  /* must chain up */
-  G_OBJECT_CLASS (g_vfs_daemon_parent_class)->finalize (object);
-}
-
-static void
-g_vfs_daemon_init (GVfsDaemon *vfs)
-{
-
-  vfs->wrapped_vfs = g_vfs_local_new ();
-}
-
-GVfsDaemon *
-g_vfs_daemon_new (void)
-{
-  return g_object_new (G_TYPE_VFS_DAEMON, NULL);
-}
-
-static GFile *
-g_vfs_daemon_get_file_for_path (GVfs       *vfs,
-				const char *path)
-{
-  GFile *file;
-
-  /* TODO: detect fuse paths and convert to daemon vfs GFiles */
-  
-  file = g_vfs_get_file_for_path (G_VFS_DAEMON (vfs)->wrapped_vfs, path);
-  
-  return g_file_daemon_local_new (file);
-}
-
-static GFile *
-g_vfs_daemon_get_file_for_uri (GVfs       *vfs,
-			       const char *uri)
-{
-  char *base;
-  GFile *file, *wrapped;
-  GDecodedUri *decoded;
-  
-  decoded = _g_decode_uri (uri);
-  if (decoded == NULL)
-    return NULL;
-
-  if (strcmp (decoded->scheme, "file") == 0)
-    {
-      wrapped = g_vfs_daemon_get_file_for_path  (vfs, decoded->path);
-      file = g_file_daemon_local_new (wrapped);
-    }
-  else
-    {
-      base = _g_encode_uri (decoded, TRUE);
-      file = g_file_daemon_new (decoded->path, base);
-      g_free (base);
-    }
-
-  _g_decoded_uri_free (decoded);
-  
-  return file;
-}
-
-static GFile *
-g_vfs_daemon_parse_name (GVfs       *vfs,
-			 const char *parse_name)
-{
-  GFile *file;
-  char *path;
-  
-  if (g_path_is_absolute (parse_name))
-    {
-      path = g_filename_from_utf8 (parse_name, -1, NULL, NULL, NULL);
-      file = g_vfs_daemon_get_file_for_path  (vfs, path);
-      g_free (path);
-    }
-  else
-    {
-      file = g_vfs_daemon_get_file_for_uri (vfs, parse_name);
-    }
-
-  return file;
-}
-
-static void
-g_vfs_daemon_vfs_iface_init (GVfsIface *iface)
-{
-  iface->get_file_for_path = g_vfs_daemon_get_file_for_path;
-  iface->get_file_for_uri = g_vfs_daemon_get_file_for_uri;
-  iface->parse_name = g_vfs_daemon_parse_name;
-}
diff --git a/gvfs/gvfsdaemon.h b/gvfs/gvfsdaemon.h
deleted file mode 100644
index ef6cf708..00000000
--- a/gvfs/gvfsdaemon.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __G_VFS_DAEMON_H__
-#define __G_VFS_DAEMON_H__
-
-#include <gvfs.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VFS_DAEMON			(g_vfs_daemon_get_type ())
-#define G_VFS_DAEMON(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VFS_DAEMON, GVfsDaemon))
-#define G_VFS_DAEMON_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_VFS_DAEMON, GVfsDaemonClass))
-#define G_IS_VFS_DAEMON(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_VFS_DAEMON))
-#define G_IS_VFS_DAEMON_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_VFS_DAEMON))
-#define G_VFS_DAEMON_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_VFS_DAEMON, GVfsDaemonClass))
-
-
-typedef struct _GVfsDaemon       GVfsDaemon;
-typedef struct _GVfsDaemonClass  GVfsDaemonClass;
-
-struct _GVfsDaemonClass
-{
-  GObjectClass parent_class;
-  
-};
-
-GType   g_vfs_daemon_get_type  (void) G_GNUC_CONST;
-
-GVfsDaemon *g_vfs_daemon_new (void);
-
-G_END_DECLS
-
-#endif /* __G_VFS_DAEMON_H__ */
diff --git a/gvfs/gvfsimpldaemon.c b/gvfs/gvfsimpldaemon.c
new file mode 100644
index 00000000..4faffd61
--- /dev/null
+++ b/gvfs/gvfsimpldaemon.c
@@ -0,0 +1,123 @@
+#include <config.h>
+#include <string.h>
+#include "gvfsimpldaemon.h"
+#include "gvfsuriutils.h"
+#include "gfiledaemon.h"
+#include "gfiledaemonlocal.h"
+#include "gvfslocal.h"
+
+static void g_vfs_impl_daemon_class_init     (GVfsImplDaemonClass *class);
+static void g_vfs_impl_daemon_vfs_iface_init (GVfsIface       *iface);
+static void g_vfs_impl_daemon_finalize       (GObject         *object);
+
+struct _GVfsImplDaemon
+{
+  GObject parent;
+
+  GVfs *wrapped_vfs;
+};
+
+G_DEFINE_TYPE_WITH_CODE (GVfsImplDaemon, g_vfs_impl_daemon, G_TYPE_OBJECT,
+			 G_IMPLEMENT_INTERFACE (G_TYPE_VFS,
+						g_vfs_impl_daemon_vfs_iface_init))
+ 
+static void
+g_vfs_impl_daemon_class_init (GVfsImplDaemonClass *class)
+{
+  GObjectClass *object_class;
+  
+  object_class = (GObjectClass *) class;
+
+  object_class->finalize = g_vfs_impl_daemon_finalize;
+}
+
+static void
+g_vfs_impl_daemon_finalize (GObject *object)
+{
+  /* must chain up */
+  G_OBJECT_CLASS (g_vfs_impl_daemon_parent_class)->finalize (object);
+}
+
+static void
+g_vfs_impl_daemon_init (GVfsImplDaemon *vfs)
+{
+
+  vfs->wrapped_vfs = g_vfs_local_new ();
+}
+
+GVfsImplDaemon *
+g_vfs_impl_daemon_new (void)
+{
+  return g_object_new (G_TYPE_VFS_IMPL_DAEMON, NULL);
+}
+
+static GFile *
+g_vfs_impl_daemon_get_file_for_path (GVfs       *vfs,
+				const char *path)
+{
+  GFile *file;
+
+  /* TODO: detect fuse paths and convert to daemon vfs GFiles */
+  
+  file = g_vfs_get_file_for_path (G_VFS_IMPL_DAEMON (vfs)->wrapped_vfs, path);
+  
+  return g_file_daemon_local_new (file);
+}
+
+static GFile *
+g_vfs_impl_daemon_get_file_for_uri (GVfs       *vfs,
+			       const char *uri)
+{
+  char *base;
+  GFile *file, *wrapped;
+  GDecodedUri *decoded;
+  
+  decoded = _g_decode_uri (uri);
+  if (decoded == NULL)
+    return NULL;
+
+  if (strcmp (decoded->scheme, "file") == 0)
+    {
+      wrapped = g_vfs_impl_daemon_get_file_for_path  (vfs, decoded->path);
+      file = g_file_daemon_local_new (wrapped);
+    }
+  else
+    {
+      base = _g_encode_uri (decoded, TRUE);
+      file = g_file_daemon_new (decoded->path, base);
+      g_free (base);
+    }
+
+  _g_decoded_uri_free (decoded);
+  
+  return file;
+}
+
+static GFile *
+g_vfs_impl_daemon_parse_name (GVfs       *vfs,
+			 const char *parse_name)
+{
+  GFile *file;
+  char *path;
+  
+  if (g_path_is_absolute (parse_name))
+    {
+      path = g_filename_from_utf8 (parse_name, -1, NULL, NULL, NULL);
+      file = g_vfs_impl_daemon_get_file_for_path  (vfs, path);
+      g_free (path);
+    }
+  else
+    {
+      file = g_vfs_impl_daemon_get_file_for_uri (vfs, parse_name);
+    }
+
+  return file;
+}
+
+static void
+g_vfs_impl_daemon_vfs_iface_init (GVfsIface *iface)
+{
+  iface->get_file_for_path = g_vfs_impl_daemon_get_file_for_path;
+  iface->get_file_for_uri = g_vfs_impl_daemon_get_file_for_uri;
+  iface->parse_name = g_vfs_impl_daemon_parse_name;
+}
diff --git a/gvfs/gvfsimpldaemon.h b/gvfs/gvfsimpldaemon.h
new file mode 100644
index 00000000..b4f61d33
--- /dev/null
+++ b/gvfs/gvfsimpldaemon.h
@@ -0,0 +1,31 @@
+#ifndef __G_VFS_IMPL_DAEMON_H__
+#define __G_VFS_IMPL_DAEMON_H__
+
+#include <gvfs.h>
+
+G_BEGIN_DECLS
+
+#define G_TYPE_VFS_IMPL_DAEMON			(g_vfs_impl_daemon_get_type ())
+#define G_VFS_IMPL_DAEMON(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VFS_IMPL_DAEMON, GVfsImplDaemon))
+#define G_VFS_IMPL_DAEMON_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_VFS_IMPL_DAEMON, GVfsImplDaemonClass))
+#define G_IS_VFS_IMPL_DAEMON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_VFS_IMPL_DAEMON))
+#define G_IS_VFS_IMPL_DAEMON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_VFS_IMPL_DAEMON))
+#define G_VFS_IMPL_DAEMON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_VFS_IMPL_DAEMON, GVfsImplDaemonClass))
+
+
+typedef struct _GVfsImplDaemon       GVfsImplDaemon;
+typedef struct _GVfsImplDaemonClass  GVfsImplDaemonClass;
+
+struct _GVfsImplDaemonClass
+{
+  GObjectClass parent_class;
+  
+};
+
+GType   g_vfs_impl_daemon_get_type  (void) G_GNUC_CONST;
+
+GVfsImplDaemon *g_vfs_impl_daemon_new (void);
+
+G_END_DECLS
+
+#endif /* __G_VFS_IMPL_DAEMON_H__ */