s/G_IS_VFS/G_VFS_IS/g

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

svn path=/trunk/; revision=378

24 files changed, 46 insertions, 46 deletions

diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h
index 9762483a..cd5ab4d1 100644
--- a/daemon/gvfsbackend.h
+++ b/daemon/gvfsbackend.h
@@ -14,8 +14,8 @@ G_BEGIN_DECLS
 #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_IS_BACKEND(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfsbackendsmb.h b/daemon/gvfsbackendsmb.h
index c905959d..504f5dc5 100644
--- a/daemon/gvfsbackendsmb.h
+++ b/daemon/gvfsbackendsmb.h
@@ -9,8 +9,8 @@ G_BEGIN_DECLS
 #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_IS_BACKEND_SMB(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND_SMB))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfsbackendsmbbrowse.h b/daemon/gvfsbackendsmbbrowse.h
index d2110128..95539380 100644
--- a/daemon/gvfsbackendsmbbrowse.h
+++ b/daemon/gvfsbackendsmbbrowse.h
@@ -9,8 +9,8 @@ G_BEGIN_DECLS
 #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_IS_BACKEND_SMB_BROWSE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND_SMB_BROWSE))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfsbackendtest.h b/daemon/gvfsbackendtest.h
index 27b63ce7..35729f10 100644
--- a/daemon/gvfsbackendtest.h
+++ b/daemon/gvfsbackendtest.h
@@ -8,8 +8,8 @@ G_BEGIN_DECLS
 #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_IS_BACKEND_TEST(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_BACKEND_TEST))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfschannel.c b/daemon/gvfschannel.c
index 8e0cfc8c..a3a1f7be 100644
--- a/daemon/gvfschannel.c
+++ b/daemon/gvfschannel.c
@@ -504,8 +504,8 @@ send_reply_cb (GOutputStream *output_stream,
   channel->priv->current_job = NULL;
   g_vfs_job_emit_finished (job);
 
-  if (G_IS_VFS_JOB_CLOSE_READ (job) ||
-      G_IS_VFS_JOB_CLOSE_WRITE (job))
+  if (G_VFS_IS_JOB_CLOSE_READ (job) ||
+      G_VFS_IS_JOB_CLOSE_WRITE (job))
     {
       g_vfs_job_source_closed (G_VFS_JOB_SOURCE (channel));
       channel->priv->backend_handle = NULL;
diff --git a/daemon/gvfschannel.h b/daemon/gvfschannel.h
index 22c55a2c..bc2ad516 100644
--- a/daemon/gvfschannel.h
+++ b/daemon/gvfschannel.h
@@ -12,8 +12,8 @@ G_BEGIN_DECLS
 #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_IS_CHANNEL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_CHANNEL))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
index 848576ba..6fca997d 100644
--- a/daemon/gvfsdaemon.c
+++ b/daemon/gvfsdaemon.c
@@ -874,7 +874,7 @@ daemon_message_func (DBusConnection *conn,
 	    {
 	      GVfsJob *job = l->data;
 	      
-	      if (G_IS_VFS_JOB_DBUS (job) &&
+	      if (G_VFS_IS_JOB_DBUS (job) &&
 		  g_vfs_job_dbus_is_serial (G_VFS_JOB_DBUS (job),
 					    conn, serial))
 		{
diff --git a/daemon/gvfsdaemon.h b/daemon/gvfsdaemon.h
index 4b92e2b5..61fb7af0 100644
--- a/daemon/gvfsdaemon.h
+++ b/daemon/gvfsdaemon.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #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_IS_DAEMON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_DAEMON))
+#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;
diff --git a/daemon/gvfsjob.h b/daemon/gvfsjob.h
index 618a257b..9650df72 100644
--- a/daemon/gvfsjob.h
+++ b/daemon/gvfsjob.h
@@ -8,8 +8,8 @@ G_BEGIN_DECLS
 #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_IS_JOB(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfsjobcloseread.h b/daemon/gvfsjobcloseread.h
index 1e183279..d4e65257 100644
--- a/daemon/gvfsjobcloseread.h
+++ b/daemon/gvfsjobcloseread.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_CLOSE_READ(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_CLOSE_READ))
+#define G_VFS_IS_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/gvfsjobclosewrite.h b/daemon/gvfsjobclosewrite.h
index 8a52e68d..14005cd5 100644
--- a/daemon/gvfsjobclosewrite.h
+++ b/daemon/gvfsjobclosewrite.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #define G_VFS_TYPE_JOB_CLOSE_WRITE         (g_vfs_job_close_write_get_type ())
 #define G_VFS_JOB_CLOSE_WRITE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_CLOSE_WRITE, GVfsJobCloseWrite))
 #define G_VFS_JOB_CLOSE_WRITE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_CLOSE_WRITE, GVfsJobCloseWriteClass))
-#define G_IS_VFS_JOB_CLOSE_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_CLOSE_WRITE))
-#define G_IS_VFS_JOB_CLOSE_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_CLOSE_WRITE))
+#define G_VFS_IS_JOB_CLOSE_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_CLOSE_WRITE))
+#define G_VFS_IS_JOB_CLOSE_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_CLOSE_WRITE))
 #define G_VFS_JOB_CLOSE_WRITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_CLOSE_WRITE, GVfsJobCloseWriteClass))
 
 typedef struct _GVfsJobCloseWriteClass   GVfsJobCloseWriteClass;
diff --git a/daemon/gvfsjobdbus.h b/daemon/gvfsjobdbus.h
index 2b7564a6..e37ebc9f 100644
--- a/daemon/gvfsjobdbus.h
+++ b/daemon/gvfsjobdbus.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_DBUS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_DBUS))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfsjobenumerate.h b/daemon/gvfsjobenumerate.h
index 5eb45e52..360c1549 100644
--- a/daemon/gvfsjobenumerate.h
+++ b/daemon/gvfsjobenumerate.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_ENUMERATE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_ENUMERATE))
+#define G_VFS_IS_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.h b/daemon/gvfsjobgetinfo.h
index 1f4fc2e1..9d1df88b 100644
--- a/daemon/gvfsjobgetinfo.h
+++ b/daemon/gvfsjobgetinfo.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_GET_INFO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_GET_INFO))
+#define G_VFS_IS_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.h b/daemon/gvfsjobmount.h
index b3a6cf9c..bf41e2c7 100644
--- a/daemon/gvfsjobmount.h
+++ b/daemon/gvfsjobmount.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_MOUNT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_MOUNT))
+#define G_VFS_IS_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.h b/daemon/gvfsjobopenforread.h
index 086c708d..ea728fd6 100644
--- a/daemon/gvfsjobopenforread.h
+++ b/daemon/gvfsjobopenforread.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_OPEN_FOR_READ(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_OPEN_FOR_READ))
+#define G_VFS_IS_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/gvfsjobopenforwrite.h b/daemon/gvfsjobopenforwrite.h
index 475295f3..a0abc593 100644
--- a/daemon/gvfsjobopenforwrite.h
+++ b/daemon/gvfsjobopenforwrite.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #define G_VFS_TYPE_JOB_OPEN_FOR_WRITE         (g_vfs_job_open_for_write_get_type ())
 #define G_VFS_JOB_OPEN_FOR_WRITE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_OPEN_FOR_WRITE, GVfsJobOpenForWrite))
 #define G_VFS_JOB_OPEN_FOR_WRITE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_OPEN_FOR_WRITE, GVfsJobOpenForWriteClass))
-#define G_IS_VFS_JOB_OPEN_FOR_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_OPEN_FOR_WRITE))
-#define G_IS_VFS_JOB_OPEN_FOR_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_OPEN_FOR_WRITE))
+#define G_VFS_IS_JOB_OPEN_FOR_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_OPEN_FOR_WRITE))
+#define G_VFS_IS_JOB_OPEN_FOR_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_OPEN_FOR_WRITE))
 #define G_VFS_JOB_OPEN_FOR_WRITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_OPEN_FOR_WRITE, GVfsJobOpenForWriteClass))
 
 typedef struct _GVfsJobOpenForWriteClass   GVfsJobOpenForWriteClass;
diff --git a/daemon/gvfsjobread.h b/daemon/gvfsjobread.h
index 8ad76853..fb371340 100644
--- a/daemon/gvfsjobread.h
+++ b/daemon/gvfsjobread.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_READ(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_READ))
+#define G_VFS_IS_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.h b/daemon/gvfsjobseekread.h
index f68bb1c8..e93c5c43 100644
--- a/daemon/gvfsjobseekread.h
+++ b/daemon/gvfsjobseekread.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #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_IS_JOB_SEEK_READ(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_SEEK_READ))
+#define G_VFS_IS_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/gvfsjobseekwrite.h b/daemon/gvfsjobseekwrite.h
index ee574942..ec1432df 100644
--- a/daemon/gvfsjobseekwrite.h
+++ b/daemon/gvfsjobseekwrite.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #define G_VFS_TYPE_JOB_SEEK_WRITE         (g_vfs_job_seek_write_get_type ())
 #define G_VFS_JOB_SEEK_WRITE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_SEEK_WRITE, GVfsJobSeekWrite))
 #define G_VFS_JOB_SEEK_WRITE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_SEEK_WRITE, GVfsJobSeekWriteClass))
-#define G_IS_VFS_JOB_SEEK_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_SEEK_WRITE))
-#define G_IS_VFS_JOB_SEEK_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_SEEK_WRITE))
+#define G_VFS_IS_JOB_SEEK_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_SEEK_WRITE))
+#define G_VFS_IS_JOB_SEEK_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_SEEK_WRITE))
 #define G_VFS_JOB_SEEK_WRITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_SEEK_WRITE, GVfsJobSeekWriteClass))
 
 typedef struct _GVfsJobSeekWriteClass   GVfsJobSeekWriteClass;
diff --git a/daemon/gvfsjobsource.h b/daemon/gvfsjobsource.h
index 2575cad7..f3ab3976 100644
--- a/daemon/gvfsjobsource.h
+++ b/daemon/gvfsjobsource.h
@@ -8,7 +8,7 @@ G_BEGIN_DECLS
 
 #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_IS_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 */
diff --git a/daemon/gvfsjobwrite.h b/daemon/gvfsjobwrite.h
index 2a29b95a..d4e4ab6d 100644
--- a/daemon/gvfsjobwrite.h
+++ b/daemon/gvfsjobwrite.h
@@ -10,8 +10,8 @@ G_BEGIN_DECLS
 #define G_VFS_TYPE_JOB_WRITE         (g_vfs_job_write_get_type ())
 #define G_VFS_JOB_WRITE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_WRITE, GVfsJobWrite))
 #define G_VFS_JOB_WRITE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_WRITE, GVfsJobWriteClass))
-#define G_IS_VFS_JOB_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_WRITE))
-#define G_IS_VFS_JOB_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_WRITE))
+#define G_VFS_IS_JOB_WRITE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_WRITE))
+#define G_VFS_IS_JOB_WRITE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_WRITE))
 #define G_VFS_JOB_WRITE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_WRITE, GVfsJobWriteClass))
 
 typedef struct _GVfsJobWriteClass   GVfsJobWriteClass;
diff --git a/daemon/gvfsreadchannel.h b/daemon/gvfsreadchannel.h
index 58f25aeb..ce9eab58 100644
--- a/daemon/gvfsreadchannel.h
+++ b/daemon/gvfsreadchannel.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #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_IS_READ_CHANNEL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_READ_CHANNEL))
+#define G_VFS_IS_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;
diff --git a/daemon/gvfswritechannel.h b/daemon/gvfswritechannel.h
index 96b5042d..97390b1a 100644
--- a/daemon/gvfswritechannel.h
+++ b/daemon/gvfswritechannel.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 #define G_VFS_TYPE_WRITE_CHANNEL         (g_vfs_write_channel_get_type ())
 #define G_VFS_WRITE_CHANNEL(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_WRITE_CHANNEL, GVfsWriteChannel))
 #define G_VFS_WRITE_CHANNEL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_WRITE_CHANNEL, GVfsWriteChannelClass))
-#define G_IS_VFS_WRITE_CHANNEL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_WRITE_CHANNEL))
-#define G_IS_VFS_WRITE_CHANNEL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_WRITE_CHANNEL))
+#define G_VFS_IS_WRITE_CHANNEL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_WRITE_CHANNEL))
+#define G_VFS_IS_WRITE_CHANNEL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_WRITE_CHANNEL))
 #define G_VFS_WRITE_CHANNEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_WRITE_CHANNEL, GVfsWriteChannelClass))
 
 typedef struct _GVfsWriteChannel        GVfsWriteChannel;