diff options
35 files changed, 135 insertions, 135 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7e8185fb..25a37ddb 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -79,7 +79,7 @@ gvfs_daemon_test_SOURCES = \ gvfs_daemon_test_CPPFLAGS = \ -DBACKEND_HEADER=gvfsbackendtest.h \ -DDEFAULT_BACKEND_TYPE=test \ - -DBACKEND_TYPES='"test", G_TYPE_VFS_BACKEND_TEST,' + -DBACKEND_TYPES='"test", G_VFS_TYPE_BACKEND_TEST,' gvfs_daemon_test_LDADD = $(libraries) @@ -92,7 +92,7 @@ gvfs_daemon_smb_CPPFLAGS = \ -DBACKEND_HEADER=gvfsbackendsmb.h \ -DDEFAULT_BACKEND_TYPE=smb-share \ -DMAX_JOB_THREADS=1 \ - -DBACKEND_TYPES='"smb-share", G_TYPE_VFS_BACKEND_SMB,' + -DBACKEND_TYPES='"smb-share", G_VFS_TYPE_BACKEND_SMB,' gvfs_daemon_smb_LDADD = $(SAMBA_LIBS) $(libraries) @@ -105,6 +105,6 @@ gvfs_daemon_smb_browse_CPPFLAGS = \ -DBACKEND_HEADER=gvfsbackendsmbbrowse.h \ -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.smb_browse \ -DMAX_JOB_THREADS=1 \ - -DBACKEND_TYPES='"smb-network", G_TYPE_VFS_BACKEND_SMB_BROWSE,"smb-server", G_TYPE_VFS_BACKEND_SMB_BROWSE,' + -DBACKEND_TYPES='"smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE,"smb-server", G_VFS_TYPE_BACKEND_SMB_BROWSE,' gvfs_daemon_smb_browse_LDADD = $(SAMBA_LIBS) $(libraries) diff --git a/daemon/gvfsbackend.c b/daemon/gvfsbackend.c index f3cdbb22..09040edb 100644 --- a/daemon/gvfsbackend.c +++ b/daemon/gvfsbackend.c @@ -55,7 +55,7 @@ static DBusHandlerResult backend_dbus_handler (DBusConnection G_DEFINE_TYPE_WITH_CODE (GVfsBackend, g_vfs_backend, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (G_TYPE_VFS_JOB_SOURCE, + G_IMPLEMENT_INTERFACE (G_VFS_TYPE_JOB_SOURCE, g_vfs_backend_job_source_iface_init)) @@ -137,7 +137,7 @@ g_vfs_backend_class_init (GVfsBackendClass *klass) g_param_spec_object ("daemon", P_("Daemon"), P_("The daemon this backend is handled by."), - G_TYPE_VFS_DAEMON, + G_VFS_TYPE_DAEMON, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); } @@ -145,7 +145,7 @@ g_vfs_backend_class_init (GVfsBackendClass *klass) static void g_vfs_backend_init (GVfsBackend *backend) { - backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, G_TYPE_VFS_BACKEND, GVfsBackendPrivate); + backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, G_VFS_TYPE_BACKEND, GVfsBackendPrivate); backend->priv->icon = g_strdup (""); backend->priv->display_name = g_strdup (""); } diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h index 71043ef3..a80d4767 100644 --- a/daemon/gvfsbackend.h +++ b/daemon/gvfsbackend.h @@ -11,12 +11,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_BACKEND (g_vfs_backend_get_type ()) -#define G_VFS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_BACKEND, GVfsBackend)) -#define G_VFS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_BACKEND, GVfsBackendClass)) -#define G_IS_VFS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_BACKEND)) -#define G_IS_VFS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_BACKEND)) -#define G_VFS_BACKEND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_BACKEND, GVfsBackendClass)) +#define G_VFS_TYPE_BACKEND (g_vfs_backend_get_type ()) +#define G_VFS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_BACKEND, GVfsBackend)) +#define G_VFS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_BACKEND, GVfsBackendClass)) +#define G_IS_VFS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND)) +#define G_IS_VFS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_BACKEND)) +#define G_VFS_BACKEND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_BACKEND, GVfsBackendClass)) typedef struct _GVfsBackend GVfsBackend; typedef struct _GVfsBackendPrivate GVfsBackendPrivate; diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c index 4c8c8c84..35891b29 100644 --- a/daemon/gvfsbackendsmb.c +++ b/daemon/gvfsbackendsmb.c @@ -50,7 +50,7 @@ struct _GVfsBackendSmb SMBCSRV *cached_server; }; -G_DEFINE_TYPE (GVfsBackendSmb, g_vfs_backend_smb, G_TYPE_VFS_BACKEND); +G_DEFINE_TYPE (GVfsBackendSmb, g_vfs_backend_smb, G_VFS_TYPE_BACKEND); static void g_vfs_backend_smb_finalize (GObject *object) diff --git a/daemon/gvfsbackendsmb.h b/daemon/gvfsbackendsmb.h index 61fd698d..c905959d 100644 --- a/daemon/gvfsbackendsmb.h +++ b/daemon/gvfsbackendsmb.h @@ -6,12 +6,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_BACKEND_SMB (g_vfs_backend_smb_get_type ()) -#define G_VFS_BACKEND_SMB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_BACKEND_SMB, GVfsBackendSmb)) -#define G_VFS_BACKEND_SMB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_BACKEND_SMB, GVfsBackendSmbClass)) -#define G_IS_VFS_BACKEND_SMB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_BACKEND_SMB)) -#define G_IS_VFS_BACKEND_SMB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_BACKEND_SMB)) -#define G_VFS_BACKEND_SMB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_BACKEND_SMB, GVfsBackendSmbClass)) +#define G_VFS_TYPE_BACKEND_SMB (g_vfs_backend_smb_get_type ()) +#define G_VFS_BACKEND_SMB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_BACKEND_SMB, GVfsBackendSmb)) +#define G_VFS_BACKEND_SMB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_BACKEND_SMB, GVfsBackendSmbClass)) +#define G_IS_VFS_BACKEND_SMB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND_SMB)) +#define G_IS_VFS_BACKEND_SMB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_BACKEND_SMB)) +#define G_VFS_BACKEND_SMB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_BACKEND_SMB, GVfsBackendSmbClass)) typedef struct _GVfsBackendSmb GVfsBackendSmb; typedef struct _GVfsBackendSmbClass GVfsBackendSmbClass; diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c index f5bc1af9..68efba2f 100644 --- a/daemon/gvfsbackendsmbbrowse.c +++ b/daemon/gvfsbackendsmbbrowse.c @@ -52,7 +52,7 @@ typedef struct { char *username; } CachedServer; -G_DEFINE_TYPE (GVfsBackendSmbBrowse, g_vfs_backend_smb_browse, G_TYPE_VFS_BACKEND); +G_DEFINE_TYPE (GVfsBackendSmbBrowse, g_vfs_backend_smb_browse, G_VFS_TYPE_BACKEND); static void browse_entry_free (BrowseEntry *entry) diff --git a/daemon/gvfsbackendsmbbrowse.h b/daemon/gvfsbackendsmbbrowse.h index 3d43f6e0..d2110128 100644 --- a/daemon/gvfsbackendsmbbrowse.h +++ b/daemon/gvfsbackendsmbbrowse.h @@ -6,12 +6,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_BACKEND_SMB_BROWSE (g_vfs_backend_smb_browse_get_type ()) -#define G_VFS_BACKEND_SMB_BROWSE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_BACKEND_SMB_BROWSE, GVfsBackendSmbBrowse)) -#define G_VFS_BACKEND_SMB_BROWSE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_BACKEND_SMB_BROWSE, GVfsBackendSmbBrowseClass)) -#define G_IS_VFS_BACKEND_SMB_BROWSE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_BACKEND_SMB_BROWSE)) -#define G_IS_VFS_BACKEND_SMB_BROWSE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_BACKEND_SMB_BROWSE)) -#define G_VFS_BACKEND_SMB_BROWSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_BACKEND_SMB_BROWSE, GVfsBackendSmbBrowseClass)) +#define G_VFS_TYPE_BACKEND_SMB_BROWSE (g_vfs_backend_smb_browse_get_type ()) +#define G_VFS_BACKEND_SMB_BROWSE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_BACKEND_SMB_BROWSE, GVfsBackendSmbBrowse)) +#define G_VFS_BACKEND_SMB_BROWSE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_BACKEND_SMB_BROWSE, GVfsBackendSmbBrowseClass)) +#define G_IS_VFS_BACKEND_SMB_BROWSE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND_SMB_BROWSE)) +#define G_IS_VFS_BACKEND_SMB_BROWSE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_BACKEND_SMB_BROWSE)) +#define G_VFS_BACKEND_SMB_BROWSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_BACKEND_SMB_BROWSE, GVfsBackendSmbBrowseClass)) typedef struct _GVfsBackendSmbBrowse GVfsBackendSmbBrowse; typedef struct _GVfsBackendSmbBrowseClass GVfsBackendSmbBrowseClass; diff --git a/daemon/gvfsbackendtest.c b/daemon/gvfsbackendtest.c index ea5f6150..a6088736 100644 --- a/daemon/gvfsbackendtest.c +++ b/daemon/gvfsbackendtest.c @@ -20,7 +20,7 @@ #include "gvfsjobgetinfo.h" #include "gvfsjobenumerate.h" -G_DEFINE_TYPE (GVfsBackendTest, g_vfs_backend_test, G_TYPE_VFS_BACKEND); +G_DEFINE_TYPE (GVfsBackendTest, g_vfs_backend_test, G_VFS_TYPE_BACKEND); static void g_vfs_backend_test_finalize (GObject *object) diff --git a/daemon/gvfsbackendtest.h b/daemon/gvfsbackendtest.h index 21712b35..27b63ce7 100644 --- a/daemon/gvfsbackendtest.h +++ b/daemon/gvfsbackendtest.h @@ -5,12 +5,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_BACKEND_TEST (g_vfs_backend_test_get_type ()) -#define G_VFS_BACKEND_TEST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_BACKEND_TEST, GVfsBackendTest)) -#define G_VFS_BACKEND_TEST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_BACKEND_TEST, GVfsBackendTestClass)) -#define G_IS_VFS_BACKEND_TEST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_BACKEND_TEST)) -#define G_IS_VFS_BACKEND_TEST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_BACKEND_TEST)) -#define G_VFS_BACKEND_TEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_BACKEND_TEST, GVfsBackendTestClass)) +#define G_VFS_TYPE_BACKEND_TEST (g_vfs_backend_test_get_type ()) +#define G_VFS_BACKEND_TEST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_BACKEND_TEST, GVfsBackendTest)) +#define G_VFS_BACKEND_TEST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_BACKEND_TEST, GVfsBackendTestClass)) +#define G_IS_VFS_BACKEND_TEST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND_TEST)) +#define G_IS_VFS_BACKEND_TEST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_BACKEND_TEST)) +#define G_VFS_BACKEND_TEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_BACKEND_TEST, GVfsBackendTestClass)) typedef struct _GVfsBackendTest GVfsBackendTest; typedef struct _GVfsBackendTestClass GVfsBackendTestClass; diff --git a/daemon/gvfschannel.c b/daemon/gvfschannel.c index 088c5f6a..a6363051 100644 --- a/daemon/gvfschannel.c +++ b/daemon/gvfschannel.c @@ -24,7 +24,7 @@ static void g_vfs_channel_job_source_iface_init (GVfsJobSourceIface *iface); G_DEFINE_TYPE_WITH_CODE (GVfsChannel, g_vfs_channel, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (G_TYPE_VFS_JOB_SOURCE, + G_IMPLEMENT_INTERFACE (G_VFS_TYPE_JOB_SOURCE, g_vfs_channel_job_source_iface_init)) /* TODO: Real P_() */ @@ -135,7 +135,7 @@ g_vfs_channel_class_init (GVfsChannelClass *klass) g_param_spec_object ("backend", P_("Backend"), P_("Backend implementation to use"), - G_TYPE_VFS_BACKEND, + G_VFS_TYPE_BACKEND, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); } @@ -147,7 +147,7 @@ g_vfs_channel_init (GVfsChannel *channel) int ret; channel->priv = G_TYPE_INSTANCE_GET_PRIVATE (channel, - G_TYPE_VFS_CHANNEL, + G_VFS_TYPE_CHANNEL, GVfsChannelPrivate); channel->priv->remote_fd = -1; diff --git a/daemon/gvfschannel.h b/daemon/gvfschannel.h index 61a76fe0..22c55a2c 100644 --- a/daemon/gvfschannel.h +++ b/daemon/gvfschannel.h @@ -9,12 +9,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_CHANNEL (g_vfs_channel_get_type ()) -#define G_VFS_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_CHANNEL, GVfsChannel)) -#define G_VFS_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_CHANNEL, GVfsChannelClass)) -#define G_IS_VFS_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_CHANNEL)) -#define G_IS_VFS_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_CHANNEL)) -#define G_VFS_CHANNEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_CHANNEL, GVfsChannelClass)) +#define G_VFS_TYPE_CHANNEL (g_vfs_channel_get_type ()) +#define G_VFS_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_CHANNEL, GVfsChannel)) +#define G_VFS_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_CHANNEL, GVfsChannelClass)) +#define G_IS_VFS_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_CHANNEL)) +#define G_IS_VFS_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_CHANNEL)) +#define G_VFS_CHANNEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_CHANNEL, GVfsChannelClass)) typedef struct _GVfsChannel GVfsChannel; typedef struct _GVfsChannelClass GVfsChannelClass; diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c index d37971ad..848576ba 100644 --- a/daemon/gvfsdaemon.c +++ b/daemon/gvfsdaemon.c @@ -202,7 +202,7 @@ g_vfs_daemon_new (gboolean main_daemon, gboolean replace) dbus_connection_setup_with_g_main (conn, NULL); - daemon = g_object_new (G_TYPE_VFS_DAEMON, NULL); + daemon = g_object_new (G_VFS_TYPE_DAEMON, NULL); daemon->main_daemon = main_daemon; /* Request name only after we've installed the message filter */ diff --git a/daemon/gvfsdaemon.h b/daemon/gvfsdaemon.h index 792a271e..4b92e2b5 100644 --- a/daemon/gvfsdaemon.h +++ b/daemon/gvfsdaemon.h @@ -8,12 +8,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_DAEMON (g_vfs_daemon_get_type ()) -#define G_VFS_DAEMON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_DAEMON, GVfsDaemon)) -#define G_VFS_DAEMON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_DAEMON, GVfsDaemonClass)) -#define G_IS_VFS_DAEMON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_DAEMON)) -#define G_IS_VFS_DAEMON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_DAEMON)) -#define G_VFS_DAEMON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_DAEMON, GVfsDaemonClass)) +#define G_VFS_TYPE_DAEMON (g_vfs_daemon_get_type ()) +#define G_VFS_DAEMON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_DAEMON, GVfsDaemon)) +#define G_VFS_DAEMON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_DAEMON, GVfsDaemonClass)) +#define G_IS_VFS_DAEMON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_DAEMON)) +#define G_IS_VFS_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; diff --git a/daemon/gvfsjob.c b/daemon/gvfsjob.c index a505f748..91dc8952 100644 --- a/daemon/gvfsjob.c +++ b/daemon/gvfsjob.c @@ -92,7 +92,7 @@ g_vfs_job_class_init (GVfsJobClass *klass) G_STRUCT_OFFSET (GVfsJobClass, new_source), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, G_TYPE_VFS_JOB_SOURCE); + G_TYPE_NONE, 1, G_VFS_TYPE_JOB_SOURCE); signals[SEND_REPLY] = g_signal_new ("send-reply", G_TYPE_FROM_CLASS (gobject_class), @@ -106,7 +106,7 @@ g_vfs_job_class_init (GVfsJobClass *klass) static void g_vfs_job_init (GVfsJob *job) { - job->priv = G_TYPE_INSTANCE_GET_PRIVATE (job, G_TYPE_VFS_JOB, GVfsJobPrivate); + job->priv = G_TYPE_INSTANCE_GET_PRIVATE (job, G_VFS_TYPE_JOB, GVfsJobPrivate); } diff --git a/daemon/gvfsjob.h b/daemon/gvfsjob.h index 1862523c..30efbfa9 100644 --- a/daemon/gvfsjob.h +++ b/daemon/gvfsjob.h @@ -5,12 +5,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB (g_vfs_job_get_type ()) -#define G_VFS_JOB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB, GVfsJob)) -#define G_VFS_JOB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB, GVfsJobClass)) -#define G_IS_VFS_JOB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB)) -#define G_IS_VFS_JOB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB)) -#define G_VFS_JOB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB, GVfsJobClass)) +#define G_VFS_TYPE_JOB (g_vfs_job_get_type ()) +#define G_VFS_JOB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB, GVfsJob)) +#define G_VFS_JOB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB, GVfsJobClass)) +#define G_IS_VFS_JOB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB)) +#define G_IS_VFS_JOB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB)) +#define G_VFS_JOB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB, GVfsJobClass)) typedef struct _GVfsJob GVfsJob; typedef struct _GVfsJobPrivate GVfsJobPrivate; diff --git a/daemon/gvfsjobcloseread.c b/daemon/gvfsjobcloseread.c index eb2c81a2..22658a06 100644 --- a/daemon/gvfsjobcloseread.c +++ b/daemon/gvfsjobcloseread.c @@ -11,7 +11,7 @@ #include "gvfsjobcloseread.h" #include "gvfsdaemonutils.h" -G_DEFINE_TYPE (GVfsJobCloseRead, g_vfs_job_close_read, G_TYPE_VFS_JOB); +G_DEFINE_TYPE (GVfsJobCloseRead, g_vfs_job_close_read, G_VFS_TYPE_JOB); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -54,7 +54,7 @@ g_vfs_job_close_read_new (GVfsReadChannel *channel, { GVfsJobCloseRead *job; - job = g_object_new (G_TYPE_VFS_JOB_CLOSE_READ, + job = g_object_new (G_VFS_TYPE_JOB_CLOSE_READ, NULL); job->channel = g_object_ref (channel); diff --git a/daemon/gvfsjobcloseread.h b/daemon/gvfsjobcloseread.h index f7725593..1e183279 100644 --- a/daemon/gvfsjobcloseread.h +++ b/daemon/gvfsjobcloseread.h @@ -7,12 +7,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_CLOSE_READ (g_vfs_job_close_read_get_type ()) -#define G_VFS_JOB_CLOSE_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_CLOSE_READ, GVfsJobCloseRead)) -#define G_VFS_JOB_CLOSE_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_CLOSE_READ, GVfsJobCloseReadClass)) -#define G_IS_VFS_JOB_CLOSE_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_CLOSE_READ)) -#define G_IS_VFS_JOB_CLOSE_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_CLOSE_READ)) -#define G_VFS_JOB_CLOSE_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_CLOSE_READ, GVfsJobCloseReadClass)) +#define G_VFS_TYPE_JOB_CLOSE_READ (g_vfs_job_close_read_get_type ()) +#define G_VFS_JOB_CLOSE_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_CLOSE_READ, GVfsJobCloseRead)) +#define G_VFS_JOB_CLOSE_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_CLOSE_READ, GVfsJobCloseReadClass)) +#define G_IS_VFS_JOB_CLOSE_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_CLOSE_READ)) +#define G_IS_VFS_JOB_CLOSE_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_CLOSE_READ)) +#define G_VFS_JOB_CLOSE_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_CLOSE_READ, GVfsJobCloseReadClass)) typedef struct _GVfsJobCloseReadClass GVfsJobCloseReadClass; diff --git a/daemon/gvfsjobdbus.c b/daemon/gvfsjobdbus.c index ffd34ec7..53dd5729 100644 --- a/daemon/gvfsjobdbus.c +++ b/daemon/gvfsjobdbus.c @@ -11,7 +11,7 @@ #include "gvfsjobdbus.h" #include "gdbusutils.h" -G_DEFINE_TYPE (GVfsJobDBus, g_vfs_job_dbus, G_TYPE_VFS_JOB); +G_DEFINE_TYPE (GVfsJobDBus, g_vfs_job_dbus, G_VFS_TYPE_JOB); /* TODO: Real P_() */ #define P_(_x) (_x) diff --git a/daemon/gvfsjobdbus.h b/daemon/gvfsjobdbus.h index c5e6fbf0..2b7564a6 100644 --- a/daemon/gvfsjobdbus.h +++ b/daemon/gvfsjobdbus.h @@ -7,12 +7,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_DBUS (g_vfs_job_dbus_get_type ()) -#define G_VFS_JOB_DBUS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_DBUS, GVfsJobDBus)) -#define G_VFS_JOB_DBUS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_DBUS, GVfsJobDBusClass)) -#define G_IS_VFS_JOB_DBUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_DBUS)) -#define G_IS_VFS_JOB_DBUS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_DBUS)) -#define G_VFS_JOB_DBUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_DBUS, GVfsJobDBusClass)) +#define G_VFS_TYPE_JOB_DBUS (g_vfs_job_dbus_get_type ()) +#define G_VFS_JOB_DBUS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_DBUS, GVfsJobDBus)) +#define G_VFS_JOB_DBUS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_DBUS, GVfsJobDBusClass)) +#define G_IS_VFS_JOB_DBUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_DBUS)) +#define G_IS_VFS_JOB_DBUS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_DBUS)) +#define G_VFS_JOB_DBUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_DBUS, GVfsJobDBusClass)) typedef struct _GVfsJobDBus GVfsJobDBus; typedef struct _GVfsJobDBusClass GVfsJobDBusClass; diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c index e1fd8c43..f2976dbd 100644 --- a/daemon/gvfsjobenumerate.c +++ b/daemon/gvfsjobenumerate.c @@ -12,7 +12,7 @@ #include "gdbusutils.h" #include "gvfsdaemonprotocol.h" -G_DEFINE_TYPE (GVfsJobEnumerate, g_vfs_job_enumerate, G_TYPE_VFS_JOB_DBUS); +G_DEFINE_TYPE (GVfsJobEnumerate, g_vfs_job_enumerate, G_VFS_TYPE_JOB_DBUS); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -89,7 +89,7 @@ g_vfs_job_enumerate_new (DBusConnection *connection, return NULL; } - job = g_object_new (G_TYPE_VFS_JOB_ENUMERATE, + job = g_object_new (G_VFS_TYPE_JOB_ENUMERATE, "message", message, "connection", connection, NULL); diff --git a/daemon/gvfsjobenumerate.h b/daemon/gvfsjobenumerate.h index 1fd3b735..5eb45e52 100644 --- a/daemon/gvfsjobenumerate.h +++ b/daemon/gvfsjobenumerate.h @@ -8,12 +8,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_ENUMERATE (g_vfs_job_enumerate_get_type ()) -#define G_VFS_JOB_ENUMERATE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_ENUMERATE, GVfsJobEnumerate)) -#define G_VFS_JOB_ENUMERATE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_ENUMERATE, GVfsJobEnumerateClass)) -#define G_IS_VFS_JOB_ENUMERATE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_ENUMERATE)) -#define G_IS_VFS_JOB_ENUMERATE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_ENUMERATE)) -#define G_VFS_JOB_ENUMERATE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_ENUMERATE, GVfsJobEnumerateClass)) +#define G_VFS_TYPE_JOB_ENUMERATE (g_vfs_job_enumerate_get_type ()) +#define G_VFS_JOB_ENUMERATE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_ENUMERATE, GVfsJobEnumerate)) +#define G_VFS_JOB_ENUMERATE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_ENUMERATE, GVfsJobEnumerateClass)) +#define G_IS_VFS_JOB_ENUMERATE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_ENUMERATE)) +#define G_IS_VFS_JOB_ENUMERATE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_ENUMERATE)) +#define G_VFS_JOB_ENUMERATE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_ENUMERATE, GVfsJobEnumerateClass)) typedef struct _GVfsJobEnumerateClass GVfsJobEnumerateClass; diff --git a/daemon/gvfsjobgetinfo.c b/daemon/gvfsjobgetinfo.c index 8f8f39f3..57db3cce 100644 --- a/daemon/gvfsjobgetinfo.c +++ b/daemon/gvfsjobgetinfo.c @@ -12,7 +12,7 @@ #include "gdbusutils.h" #include "gvfsdaemonprotocol.h" -G_DEFINE_TYPE (GVfsJobGetInfo, g_vfs_job_get_info, G_TYPE_VFS_JOB_DBUS); +G_DEFINE_TYPE (GVfsJobGetInfo, g_vfs_job_get_info, G_VFS_TYPE_JOB_DBUS); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -87,7 +87,7 @@ g_vfs_job_get_info_new (DBusConnection *connection, return NULL; } - job = g_object_new (G_TYPE_VFS_JOB_GET_INFO, + job = g_object_new (G_VFS_TYPE_JOB_GET_INFO, "message", message, "connection", connection, NULL); diff --git a/daemon/gvfsjobgetinfo.h b/daemon/gvfsjobgetinfo.h index f404c842..1f4fc2e1 100644 --- a/daemon/gvfsjobgetinfo.h +++ b/daemon/gvfsjobgetinfo.h @@ -8,12 +8,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_GET_INFO (g_vfs_job_get_info_get_type ()) -#define G_VFS_JOB_GET_INFO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_GET_INFO, GVfsJobGetInfo)) -#define G_VFS_JOB_GET_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_GET_INFO, GVfsJobGetInfoClass)) -#define G_IS_VFS_JOB_GET_INFO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_GET_INFO)) -#define G_IS_VFS_JOB_GET_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_GET_INFO)) -#define G_VFS_JOB_GET_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_GET_INFO, GVfsJobGetInfoClass)) +#define G_VFS_TYPE_JOB_GET_INFO (g_vfs_job_get_info_get_type ()) +#define G_VFS_JOB_GET_INFO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_GET_INFO, GVfsJobGetInfo)) +#define G_VFS_JOB_GET_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_GET_INFO, GVfsJobGetInfoClass)) +#define G_IS_VFS_JOB_GET_INFO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_GET_INFO)) +#define G_IS_VFS_JOB_GET_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_GET_INFO)) +#define G_VFS_JOB_GET_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_GET_INFO, GVfsJobGetInfoClass)) typedef struct _GVfsJobGetInfoClass GVfsJobGetInfoClass; diff --git a/daemon/gvfsjobmount.c b/daemon/gvfsjobmount.c index 83f5904d..d1b1527d 100644 --- a/daemon/gvfsjobmount.c +++ b/daemon/gvfsjobmount.c @@ -12,7 +12,7 @@ #include "gdbusutils.h" #include "gvfsdaemonprotocol.h" -G_DEFINE_TYPE (GVfsJobMount, g_vfs_job_mount, G_TYPE_VFS_JOB); +G_DEFINE_TYPE (GVfsJobMount, g_vfs_job_mount, G_VFS_TYPE_JOB); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -56,7 +56,7 @@ g_vfs_job_mount_new (GMountSpec *spec, { GVfsJobMount *job; - job = g_object_new (G_TYPE_VFS_JOB_MOUNT, + job = g_object_new (G_VFS_TYPE_JOB_MOUNT, NULL); job->mount_spec = g_mount_spec_ref (spec); diff --git a/daemon/gvfsjobmount.h b/daemon/gvfsjobmount.h index 655371c3..b3a6cf9c 100644 --- a/daemon/gvfsjobmount.h +++ b/daemon/gvfsjobmount.h @@ -8,12 +8,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_MOUNT (g_vfs_job_mount_get_type ()) -#define G_VFS_JOB_MOUNT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_MOUNT, GVfsJobMount)) -#define G_VFS_JOB_MOUNT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_MOUNT, GVfsJobMountClass)) -#define G_IS_VFS_JOB_MOUNT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_MOUNT)) -#define G_IS_VFS_JOB_MOUNT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_MOUNT)) -#define G_VFS_JOB_MOUNT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_MOUNT, GVfsJobMountClass)) +#define G_VFS_TYPE_JOB_MOUNT (g_vfs_job_mount_get_type ()) +#define G_VFS_JOB_MOUNT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_MOUNT, GVfsJobMount)) +#define G_VFS_JOB_MOUNT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_MOUNT, GVfsJobMountClass)) +#define G_IS_VFS_JOB_MOUNT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_MOUNT)) +#define G_IS_VFS_JOB_MOUNT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_MOUNT)) +#define G_VFS_JOB_MOUNT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_MOUNT, GVfsJobMountClass)) typedef struct _GVfsJobMountClass GVfsJobMountClass; diff --git a/daemon/gvfsjobopenforread.c b/daemon/gvfsjobopenforread.c index ce045b22..f2db2386 100644 --- a/daemon/gvfsjobopenforread.c +++ b/daemon/gvfsjobopenforread.c @@ -13,7 +13,7 @@ #include "gdbusutils.h" #include "gvfsdaemonutils.h" -G_DEFINE_TYPE (GVfsJobOpenForRead, g_vfs_job_open_for_read, G_TYPE_VFS_JOB_DBUS); +G_DEFINE_TYPE (GVfsJobOpenForRead, g_vfs_job_open_for_read, G_VFS_TYPE_JOB_DBUS); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -85,7 +85,7 @@ g_vfs_job_open_for_read_new (DBusConnection *connection, return NULL; } - job = g_object_new (G_TYPE_VFS_JOB_OPEN_FOR_READ, + job = g_object_new (G_VFS_TYPE_JOB_OPEN_FOR_READ, "message", message, "connection", connection, NULL); diff --git a/daemon/gvfsjobopenforread.h b/daemon/gvfsjobopenforread.h index 82759b45..086c708d 100644 --- a/daemon/gvfsjobopenforread.h +++ b/daemon/gvfsjobopenforread.h @@ -8,12 +8,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_OPEN_FOR_READ (g_vfs_job_open_for_read_get_type ()) -#define G_VFS_JOB_OPEN_FOR_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_OPEN_FOR_READ, GVfsJobOpenForRead)) -#define G_VFS_JOB_OPEN_FOR_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_OPEN_FOR_READ, GVfsJobOpenForReadClass)) -#define G_IS_VFS_JOB_OPEN_FOR_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_OPEN_FOR_READ)) -#define G_IS_VFS_JOB_OPEN_FOR_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_OPEN_FOR_READ)) -#define G_VFS_JOB_OPEN_FOR_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_OPEN_FOR_READ, GVfsJobOpenForReadClass)) +#define G_VFS_TYPE_JOB_OPEN_FOR_READ (g_vfs_job_open_for_read_get_type ()) +#define G_VFS_JOB_OPEN_FOR_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_OPEN_FOR_READ, GVfsJobOpenForRead)) +#define G_VFS_JOB_OPEN_FOR_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_OPEN_FOR_READ, GVfsJobOpenForReadClass)) +#define G_IS_VFS_JOB_OPEN_FOR_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_OPEN_FOR_READ)) +#define G_IS_VFS_JOB_OPEN_FOR_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_OPEN_FOR_READ)) +#define G_VFS_JOB_OPEN_FOR_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_OPEN_FOR_READ, GVfsJobOpenForReadClass)) typedef struct _GVfsJobOpenForReadClass GVfsJobOpenForReadClass; diff --git a/daemon/gvfsjobread.c b/daemon/gvfsjobread.c index 26c87159..6d143869 100644 --- a/daemon/gvfsjobread.c +++ b/daemon/gvfsjobread.c @@ -11,7 +11,7 @@ #include "gvfsjobread.h" #include "gvfsdaemonutils.h" -G_DEFINE_TYPE (GVfsJobRead, g_vfs_job_read, G_TYPE_VFS_JOB); +G_DEFINE_TYPE (GVfsJobRead, g_vfs_job_read, G_VFS_TYPE_JOB); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -57,7 +57,7 @@ g_vfs_job_read_new (GVfsReadChannel *channel, { GVfsJobRead *job; - job = g_object_new (G_TYPE_VFS_JOB_READ, + job = g_object_new (G_VFS_TYPE_JOB_READ, NULL); job->backend = backend; diff --git a/daemon/gvfsjobread.h b/daemon/gvfsjobread.h index ea084428..8ad76853 100644 --- a/daemon/gvfsjobread.h +++ b/daemon/gvfsjobread.h @@ -7,12 +7,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_READ (g_vfs_job_read_get_type ()) -#define G_VFS_JOB_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_READ, GVfsJobRead)) -#define G_VFS_JOB_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_READ, GVfsJobReadClass)) -#define G_IS_VFS_JOB_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_READ)) -#define G_IS_VFS_JOB_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_READ)) -#define G_VFS_JOB_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_READ, GVfsJobReadClass)) +#define G_VFS_TYPE_JOB_READ (g_vfs_job_read_get_type ()) +#define G_VFS_JOB_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_READ, GVfsJobRead)) +#define G_VFS_JOB_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_READ, GVfsJobReadClass)) +#define G_IS_VFS_JOB_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_READ)) +#define G_IS_VFS_JOB_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_READ)) +#define G_VFS_JOB_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_READ, GVfsJobReadClass)) typedef struct _GVfsJobReadClass GVfsJobReadClass; diff --git a/daemon/gvfsjobseekread.c b/daemon/gvfsjobseekread.c index de197ec3..74346f19 100644 --- a/daemon/gvfsjobseekread.c +++ b/daemon/gvfsjobseekread.c @@ -11,7 +11,7 @@ #include "gvfsjobseekread.h" #include "gvfsdaemonutils.h" -G_DEFINE_TYPE (GVfsJobSeekRead, g_vfs_job_seek_read, G_TYPE_VFS_JOB); +G_DEFINE_TYPE (GVfsJobSeekRead, g_vfs_job_seek_read, G_VFS_TYPE_JOB); static void run (GVfsJob *job); static gboolean try (GVfsJob *job); @@ -56,7 +56,7 @@ g_vfs_job_seek_read_new (GVfsReadChannel *channel, { GVfsJobSeekRead *job; - job = g_object_new (G_TYPE_VFS_JOB_SEEK_READ, + job = g_object_new (G_VFS_TYPE_JOB_SEEK_READ, NULL); job->backend = backend; diff --git a/daemon/gvfsjobseekread.h b/daemon/gvfsjobseekread.h index 15f5bc64..f68bb1c8 100644 --- a/daemon/gvfsjobseekread.h +++ b/daemon/gvfsjobseekread.h @@ -7,12 +7,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_SEEK_READ (g_vfs_job_seek_read_get_type ()) -#define G_VFS_JOB_SEEK_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_JOB_SEEK_READ, GVfsJobSeekRead)) -#define G_VFS_JOB_SEEK_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_JOB_SEEK_READ, GVfsJobSeekReadClass)) -#define G_IS_VFS_JOB_SEEK_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_JOB_SEEK_READ)) -#define G_IS_VFS_JOB_SEEK_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_JOB_SEEK_READ)) -#define G_VFS_JOB_SEEK_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_JOB_SEEK_READ, GVfsJobSeekReadClass)) +#define G_VFS_TYPE_JOB_SEEK_READ (g_vfs_job_seek_read_get_type ()) +#define G_VFS_JOB_SEEK_READ(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_SEEK_READ, GVfsJobSeekRead)) +#define G_VFS_JOB_SEEK_READ_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_SEEK_READ, GVfsJobSeekReadClass)) +#define G_IS_VFS_JOB_SEEK_READ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_SEEK_READ)) +#define G_IS_VFS_JOB_SEEK_READ_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_SEEK_READ)) +#define G_VFS_JOB_SEEK_READ_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_SEEK_READ, GVfsJobSeekReadClass)) typedef struct _GVfsJobSeekReadClass GVfsJobSeekReadClass; diff --git a/daemon/gvfsjobsource.c b/daemon/gvfsjobsource.c index b403dd1d..fb62d316 100644 --- a/daemon/gvfsjobsource.c +++ b/daemon/gvfsjobsource.c @@ -53,16 +53,16 @@ g_vfs_job_source_base_init (gpointer g_class) signals[NEW_JOB] = g_signal_new ("new_job", - G_TYPE_VFS_JOB_SOURCE, + G_VFS_TYPE_JOB_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVfsJobSourceIface, new_job), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, G_TYPE_VFS_JOB); + G_TYPE_NONE, 1, G_VFS_TYPE_JOB); signals[CLOSED] = g_signal_new ("closed", - G_TYPE_VFS_JOB_SOURCE, + G_VFS_TYPE_JOB_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVfsJobSourceIface, closed), NULL, NULL, diff --git a/daemon/gvfsjobsource.h b/daemon/gvfsjobsource.h index 72ae390a..2575cad7 100644 --- a/daemon/gvfsjobsource.h +++ b/daemon/gvfsjobsource.h @@ -6,10 +6,10 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_JOB_SOURCE (g_vfs_job_source_get_type ()) -#define G_VFS_JOB_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VFS_JOB_SOURCE, GVfsJobSource)) -#define G_IS_VFS_JOB_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_VFS_JOB_SOURCE)) -#define G_VFS_JOB_SOURCE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_VFS_JOB_SOURCE, GVfsJobSourceIface)) +#define G_VFS_TYPE_JOB_SOURCE (g_vfs_job_source_get_type ()) +#define G_VFS_JOB_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_VFS_TYPE_JOB_SOURCE, GVfsJobSource)) +#define G_IS_VFS_JOB_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_VFS_TYPE_JOB_SOURCE)) +#define G_VFS_JOB_SOURCE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_VFS_TYPE_JOB_SOURCE, GVfsJobSourceIface)) /* GVfsJobSource defined in gvfsjob.h */ typedef struct _GVfsJobSourceIface GVfsJobSourceIface; diff --git a/daemon/gvfsreadchannel.c b/daemon/gvfsreadchannel.c index b3b2931f..a98872e3 100644 --- a/daemon/gvfsreadchannel.c +++ b/daemon/gvfsreadchannel.c @@ -28,7 +28,7 @@ struct _GVfsReadChannel int seek_generation; }; -G_DEFINE_TYPE (GVfsReadChannel, g_vfs_read_channel, G_TYPE_VFS_CHANNEL) +G_DEFINE_TYPE (GVfsReadChannel, g_vfs_read_channel, G_VFS_TYPE_CHANNEL) static GVfsJob *read_channel_close (GVfsChannel *channel); static GVfsJob *read_channel_handle_request (GVfsChannel *channel, @@ -198,7 +198,7 @@ g_vfs_read_channel_send_data (GVfsReadChannel *read_channel, GVfsReadChannel * g_vfs_read_channel_new (GVfsBackend *backend) { - return g_object_new (G_TYPE_VFS_READ_CHANNEL, + return g_object_new (G_VFS_TYPE_READ_CHANNEL, "backend", backend, NULL); } diff --git a/daemon/gvfsreadchannel.h b/daemon/gvfsreadchannel.h index b4e74a2b..58f25aeb 100644 --- a/daemon/gvfsreadchannel.h +++ b/daemon/gvfsreadchannel.h @@ -8,12 +8,12 @@ G_BEGIN_DECLS -#define G_TYPE_VFS_READ_CHANNEL (g_vfs_read_channel_get_type ()) -#define G_VFS_READ_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS_READ_CHANNEL, GVfsReadChannel)) -#define G_VFS_READ_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS_READ_CHANNEL, GVfsReadChannelClass)) -#define G_IS_VFS_READ_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS_READ_CHANNEL)) -#define G_IS_VFS_READ_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS_READ_CHANNEL)) -#define G_VFS_READ_CHANNEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS_READ_CHANNEL, GVfsReadChannelClass)) +#define G_VFS_TYPE_READ_CHANNEL (g_vfs_read_channel_get_type ()) +#define G_VFS_READ_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_READ_CHANNEL, GVfsReadChannel)) +#define G_VFS_READ_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_READ_CHANNEL, GVfsReadChannelClass)) +#define G_IS_VFS_READ_CHANNEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_READ_CHANNEL)) +#define G_IS_VFS_READ_CHANNEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_READ_CHANNEL)) +#define G_VFS_READ_CHANNEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_READ_CHANNEL, GVfsReadChannelClass)) typedef struct _GVfsReadChannel GVfsReadChannel; typedef struct _GVfsReadChannelClass GVfsReadChannelClass; |