GNOME.org
 

[gvfs] afp: rename afp backend to GVfsAfpBackendBrowse

commit 086e3b296a2bda6edab0d4975e2e8bb2e3a947d0
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Tue Jun 14 13:55:23 2011 +0200

    afp: rename afp backend to GVfsAfpBackendBrowse

 daemon/Makefile.am                                 |   19 +++++------
 daemon/{afp.mount.in => afp-browse.mount.in}       |    2 +-
 .../{gvfsbackendafp.c => gvfsbackendafpbrowse.c}   |   32 ++++++++++----------
 .../{gvfsbackendafp.h => gvfsbackendafpbrowse.h}   |   22 +++++++-------
 4 files changed, 37 insertions(+), 38 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b5edeb8..e5fbccf 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -40,10 +40,10 @@ service_DATA = gvfs-daemon.service
 %.mount: %.mount.in ../config.log
 	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network gvfsd-afp
+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network gvfsd-afp-browse
 
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in afp.mount.in
-mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount afp.mount
+mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in afp-browse.mount.in
+mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount afp-browse.mount
 
 mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in 
 if HAVE_HTTP
@@ -472,8 +472,8 @@ gvfsd_afc_LDADD = \
 	$(libraries) \
 	$(AFC_LIBS)
 
-gvfsd_afp_SOURCES = \
-	gvfsbackendafp.c gvfsbackendafp.h \
+gvfsd_afp_browse_SOURCES = \
+	gvfsbackendafpbrowse.c gvfsbackendafpbrowse.h \
 	daemon-main.c daemon-main.h \
 	daemon-main-generic.c \
 	gvfsafpconnection.h \
@@ -481,14 +481,13 @@ gvfsd_afp_SOURCES = \
 	gvfsafpserver.h \
 	gvfsafpserver.c
 
-gvfsd_afp_CPPFLAGS = \
-	-DBACKEND_HEADER=gvfsbackendafp.h \
-	-DDEFAULT_BACKEND_TYPE=afp \
+gvfsd_afp_browse_CPPFLAGS = \
+	-DBACKEND_HEADER=gvfsbackendafpbrowse.h \
 	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"afp-server", G_VFS_TYPE_BACKEND_AFP,' \
+	-DBACKEND_TYPES='"afp-server", G_VFS_TYPE_BACKEND_AFP_BROWSE,' \
 	$(LIBGCRYPT_CFLAGS)
 
-gvfsd_afp_LDADD = \
+gvfsd_afp_browse_LDADD = \
 	$(libraries) \
 	$(LIBGCRYPT_LIBS)
 
diff --git a/daemon/afp.mount.in b/daemon/afp-browse.mount.in
similarity index 73%
rename from daemon/afp.mount.in
rename to daemon/afp-browse.mount.in
index e10f288..bd890be 100644
--- a/daemon/afp.mount.in
+++ b/daemon/afp-browse.mount.in
@@ -1,6 +1,6 @@
 [Mount]
 Type=afp-server
-Exec= libexecdir@/gvfsd-afp
+Exec= libexecdir@/gvfsd-afp-browse
 AutoMount=false
 Scheme=afp
 DefaultPort=548
diff --git a/daemon/gvfsbackendafp.c b/daemon/gvfsbackendafpbrowse.c
similarity index 90%
rename from daemon/gvfsbackendafp.c
rename to daemon/gvfsbackendafpbrowse.c
index f969061..fa0a078 100644
--- a/daemon/gvfsbackendafp.c
+++ b/daemon/gvfsbackendafpbrowse.c
@@ -38,14 +38,14 @@
 #include "gvfsafpserver.h"
 #include "gvfsafpconnection.h"
 
-#include "gvfsbackendafp.h"
+#include "gvfsbackendafpbrowse.h"
 
-struct _GVfsBackendAfpClass
+struct _GVfsBackendAfpBrowseClass
 {
 	GVfsBackendClass parent_class;
 };
 
-struct _GVfsBackendAfp
+struct _GVfsBackendAfpBrowse
 {
 	GVfsBackend parent_instance;
 
@@ -57,7 +57,7 @@ struct _GVfsBackendAfp
 };
 
 
-G_DEFINE_TYPE (GVfsBackendAfp, g_vfs_backend_afp, G_VFS_TYPE_BACKEND);
+G_DEFINE_TYPE (GVfsBackendAfpBrowse, g_vfs_backend_afp_browse, G_VFS_TYPE_BACKEND);
 
 
 static void
@@ -67,7 +67,7 @@ get_srvr_parms_cb (GVfsAfpConnection *afp_connection,
                    gpointer           user_data)
 {
   GVfsJobEnumerate *job = G_VFS_JOB_ENUMERATE (user_data);
-  GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (job->backend);
+  GVfsBackendAfpBrowse *afp_backend = G_VFS_BACKEND_AFP_BROWSE (job->backend);
 
   AfpResultCode res_code;
   guint8 num_volumes, i;
@@ -173,7 +173,7 @@ try_enumerate (GVfsBackend *backend,
                GFileAttributeMatcher *attribute_matcher,
                GFileQueryInfoFlags flags)
 {
-  GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (backend);
+  GVfsBackendAfpBrowse *afp_backend = G_VFS_BACKEND_AFP_BROWSE (backend);
 
   GVfsAfpCommand *comm;
   
@@ -231,7 +231,7 @@ do_mount (GVfsBackend *backend,
           GMountSource *mount_source,
           gboolean is_automount)
 {
-  GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (backend);
+  GVfsBackendAfpBrowse *afp_backend = G_VFS_BACKEND_AFP_BROWSE (backend);
 
   gboolean res;
   GError *err = NULL;
@@ -278,7 +278,7 @@ try_mount (GVfsBackend *backend,
            GMountSource *mount_source,
            gboolean is_automount)
 {
-	GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (backend);
+	GVfsBackendAfpBrowse *afp_backend = G_VFS_BACKEND_AFP_BROWSE (backend);
 	
 	const char *host, *portstr, *user;
 	guint16 port = 548;
@@ -307,30 +307,30 @@ try_mount (GVfsBackend *backend,
 }
 
 static void
-g_vfs_backend_afp_init (GVfsBackendAfp *object)
+g_vfs_backend_afp_browse_init (GVfsBackendAfpBrowse *object)
 {
-  GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (object);
+  GVfsBackendAfpBrowse *afp_backend = G_VFS_BACKEND_AFP_BROWSE (object);
 
   afp_backend->mount_tracker = g_mount_tracker_new (NULL);
 }
 
 static void
-g_vfs_backend_afp_finalize (GObject *object)
+g_vfs_backend_afp_browse_finalize (GObject *object)
 {
-  GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (object);
+  GVfsBackendAfpBrowse *afp_backend = G_VFS_BACKEND_AFP_BROWSE (object);
 
   g_object_unref (afp_backend->mount_tracker);
   
-	G_OBJECT_CLASS (g_vfs_backend_afp_parent_class)->finalize (object);
+	G_OBJECT_CLASS (g_vfs_backend_afp_browse_parent_class)->finalize (object);
 }
 
 static void
-g_vfs_backend_afp_class_init (GVfsBackendAfpClass *klass)
+g_vfs_backend_afp_browse_class_init (GVfsBackendAfpBrowseClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	GVfsBackendClass *backend_class = G_VFS_BACKEND_CLASS (klass);
 
-	object_class->finalize = g_vfs_backend_afp_finalize;
+	object_class->finalize = g_vfs_backend_afp_browse_finalize;
 
 	backend_class->try_mount = try_mount;
   backend_class->mount = do_mount;
@@ -339,7 +339,7 @@ g_vfs_backend_afp_class_init (GVfsBackendAfpClass *klass)
 }
 
 void
-g_vfs_afp_daemon_init (void)
+g_vfs_afp_browse_daemon_init (void)
 {
   g_set_application_name (_("Apple Filing Protocol Service"));
 
diff --git a/daemon/gvfsbackendafp.h b/daemon/gvfsbackendafpbrowse.h
similarity index 50%
rename from daemon/gvfsbackendafp.h
rename to daemon/gvfsbackendafpbrowse.h
index 1928a57..5aabda6 100644
--- a/daemon/gvfsbackendafp.h
+++ b/daemon/gvfsbackendafpbrowse.h
@@ -27,20 +27,20 @@
 
 G_BEGIN_DECLS
 
-#define G_VFS_TYPE_BACKEND_AFP             (g_vfs_backend_afp_get_type ())
-#define G_VFS_BACKEND_AFP(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_VFS_TYPE_BACKEND_AFP, GVfsBackendAfp))
-#define G_VFS_BACKEND_AFP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), G_VFS_TYPE_BACKEND_AFP, GVfsBackendAfpClass))
-#define G_IS_VFS_BACKEND_AFP(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_VFS_TYPE_BACKEND_AFP))
-#define G_IS_VFS_BACKEND_AFP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), G_VFS_TYPE_BACKEND_AFP))
-#define G_VFS_BACKEND_AFP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), G_VFS_TYPE_BACKEND_AFP, GVfsBackendAfpClass))
+#define G_VFS_TYPE_BACKEND_AFP_BROWSE             (g_vfs_backend_afp_browse_get_type ())
+#define G_VFS_BACKEND_AFP_BROWSE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_VFS_TYPE_BACKEND_AFP_BROWSE, GVfsBackendAfpBrowse))
+#define G_VFS_BACKEND_AFP_BROWSE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), G_VFS_TYPE_BACKEND_AFP_BROWSE, GVfsBackendAfpBrowseClass))
+#define G_IS_VFS_BACKEND_AFP_BROWSE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_VFS_TYPE_BACKEND_AFP_BROWSE))
+#define G_IS_VFS_BACKEND_AFP_BROWSE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), G_VFS_TYPE_BACKEND_AFP_BROWSE))
+#define G_VFS_BACKEND_AFP_BROWSE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), G_VFS_TYPE_BACKEND_AFP_BROWSE, GVfsBackendAfpBrowseClass))
 
-typedef struct _GVfsBackendAfpClass GVfsBackendAfpClass;
-typedef struct _GVfsBackendAfp GVfsBackendAfp;
+typedef struct _GVfsBackendAfpBrowseClass GVfsBackendAfpBrowseClass;
+typedef struct _GVfsBackendAfpBrowse GVfsBackendAfpBrowse;
 
-GType g_vfs_backend_afp_get_type (void) G_GNUC_CONST;
+GType g_vfs_backend_afp_browse_get_type (void) G_GNUC_CONST;
 
-#define BACKEND_SETUP_FUNC g_vfs_afp_daemon_init
-void g_vfs_afp_daemon_init (void);
+#define BACKEND_SETUP_FUNC g_vfs_afp_browse_daemon_init
+void g_vfs_afp_browse_daemon_init (void);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]