Inconsistencies in gnome-vfs casting macros

[Federico Mena Quintero <federico ximian com>]

Hi,

There are a few inconsistencies with gnome-vfs's casting macros.  Please
see the attached patch.

We have GNOME_TYPE_VFS_FOO and GNOME_VFS_TYPE_FOO versions.  In the case
of gnome-vfs-drive.h and gnome-vfs-volume.h, the casting/testing macros
did not match the gimme-the-type macro.

This patch "fixes" those files so that at least their macros will be
consistent to each other, but what about the rest?  They would need
source changes and we are frozen, etc. (we would still be ABI
compatible).

  Federico

? libgnomevfs/gnome-vfs-enum-types.c
? libgnomevfs/gnome-vfs-enum-types.h
? libgnomevfs/s-enum-types-c
? libgnomevfs/s-enum-types-h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.1682
diff -u -r1.1682 ChangeLog
--- ChangeLog	19 Dec 2003 22:52:29 -0000	1.1682
+++ ChangeLog	22 Dec 2003 20:48:35 -0000
@@ -1,3 +1,9 @@
+2003-12-22  Federico Mena Quintero  <federico ximian com>
+
+	* libgnomevfs/gnome-vfs-drive.h: Fix the casting and type-testing macros.
+
+	* libgnomevfs/gnome-vfs-volume.h: Likewise.
+
 2003-12-19  Christian Neumair  <chris gnome-de org>
 
 	* schemas/desktop_gnome_url_handlers.schemas.in:
Index: libgnomevfs/gnome-vfs-drive.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-drive.h,v
retrieving revision 1.3
diff -u -r1.3 gnome-vfs-drive.h
--- libgnomevfs/gnome-vfs-drive.h	6 Nov 2003 15:57:02 -0000	1.3
+++ libgnomevfs/gnome-vfs-drive.h	22 Dec 2003 20:48:35 -0000
@@ -30,10 +30,10 @@
 G_BEGIN_DECLS
 
 #define GNOME_VFS_TYPE_DRIVE        (gnome_vfs_drive_get_type ())
-#define GNOME_VFS_DRIVE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GNOME_TYPE_VFS_DRIVE, GnomeVFSDrive))
-#define GNOME_VFS_DRIVE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GNOME_TYPE_VFS_DRIVE, GnomeVFSDriveClass))
-#define GNOME_IS_VFS_DRIVE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNOME_TYPE_VFS_DRIVE))
-#define GNOME_IS_VFS_DRIVE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_TYPE_VFS_DRIVE))
+#define GNOME_VFS_DRIVE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GNOME_VFS_TYPE_DRIVE, GnomeVFSDrive))
+#define GNOME_VFS_DRIVE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GNOME_VFS_TYPE_DRIVE, GnomeVFSDriveClass))
+#define GNOME_IS_VFS_DRIVE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNOME_VFS_TYPE_DRIVE))
+#define GNOME_IS_VFS_DRIVE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_VFS_TYPE_DRIVE))
 
 typedef struct _GnomeVFSDrivePrivate GnomeVFSDrivePrivate;
 
Index: libgnomevfs/gnome-vfs-volume.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-volume.h,v
retrieving revision 1.3
diff -u -r1.3 gnome-vfs-volume.h
--- libgnomevfs/gnome-vfs-volume.h	6 Nov 2003 15:57:02 -0000	1.3
+++ libgnomevfs/gnome-vfs-volume.h	22 Dec 2003 20:48:35 -0000
@@ -43,10 +43,10 @@
 G_BEGIN_DECLS
 
 #define GNOME_VFS_TYPE_VOLUME        (gnome_vfs_volume_get_type ())
-#define GNOME_VFS_VOLUME(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GNOME_TYPE_VFS_VOLUME, GnomeVFSVolume))
-#define GNOME_VFS_VOLUME_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GNOME_TYPE_VFS_VOLUME, GnomeVFSVolumeClass))
-#define GNOME_IS_VFS_VOLUME(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNOME_TYPE_VFS_VOLUME))
-#define GNOME_IS_VFS_VOLUME_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_TYPE_VFS_VOLUME))
+#define GNOME_VFS_VOLUME(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GNOME_VFS_TYPE_VOLUME, GnomeVFSVolume))
+#define GNOME_VFS_VOLUME_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GNOME_VFS_TYPE_VOLUME, GnomeVFSVolumeClass))
+#define GNOME_IS_VFS_VOLUME(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNOME_VFS_TYPE_VOLUME))
+#define GNOME_IS_VFS_VOLUME_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_VFS_TYPE_VOLUME))
 
 typedef struct _GnomeVFSVolumePrivate GnomeVFSVolumePrivate;