Don't use deprecated gtktype type and macros. Bug #539168.

svn path=/trunk/; revision=5483

6 files changed, 30 insertions, 30 deletions

diff --git a/src/plugins/properties/bacon-video-widget-properties.h b/src/plugins/properties/bacon-video-widget-properties.h
index a6d42854..9e4f77e6 100644
--- a/src/plugins/properties/bacon-video-widget-properties.h
+++ b/src/plugins/properties/bacon-video-widget-properties.h
@@ -26,10 +26,10 @@
 #include <gtk/gtkvbox.h>
 
 #define BACON_TYPE_VIDEO_WIDGET_PROPERTIES            (bacon_video_widget_properties_get_type ())
-#define BACON_VIDEO_WIDGET_PROPERTIES(obj)            (GTK_CHECK_CAST ((obj), BACON_TYPE_VIDEO_WIDGET_PROPERTIES, BaconVideoWidgetProperties))
-#define BACON_VIDEO_WIDGET_PROPERTIES_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), BACON_TYPE_VIDEO_WIDGET_PROPERTIES, BaconVideoWidgetPropertiesClass))
-#define BACON_IS_VIDEO_WIDGET_PROPERTIES(obj)         (GTK_CHECK_TYPE ((obj), BACON_TYPE_VIDEO_WIDGET_PROPERTIES))
-#define BACON_IS_VIDEO_WIDGET_PROPERTIES_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), BACON_TYPE_VIDEO_WIDGET_PROPERTIES))
+#define BACON_VIDEO_WIDGET_PROPERTIES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), BACON_TYPE_VIDEO_WIDGET_PROPERTIES, BaconVideoWidgetProperties))
+#define BACON_VIDEO_WIDGET_PROPERTIES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), BACON_TYPE_VIDEO_WIDGET_PROPERTIES, BaconVideoWidgetPropertiesClass))
+#define BACON_IS_VIDEO_WIDGET_PROPERTIES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BACON_TYPE_VIDEO_WIDGET_PROPERTIES))
+#define BACON_IS_VIDEO_WIDGET_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BACON_TYPE_VIDEO_WIDGET_PROPERTIES))
 
 typedef struct BaconVideoWidgetProperties		BaconVideoWidgetProperties;
 typedef struct BaconVideoWidgetPropertiesClass		BaconVideoWidgetPropertiesClass;
@@ -44,7 +44,7 @@ struct BaconVideoWidgetPropertiesClass {
 	GtkVBoxClass parent_class;
 };
 
-GtkType bacon_video_widget_properties_get_type		(void);
+GType bacon_video_widget_properties_get_type		(void);
 GtkWidget *bacon_video_widget_properties_new		(void);
 
 void bacon_video_widget_properties_reset		(BaconVideoWidgetProperties *props);
diff --git a/src/plugins/skipto/totem-skipto.h b/src/plugins/skipto/totem-skipto.h
index 3bce3afe..dd4b9dcf 100644
--- a/src/plugins/skipto/totem-skipto.h
+++ b/src/plugins/skipto/totem-skipto.h
@@ -38,10 +38,10 @@
 G_BEGIN_DECLS
 
 #define TOTEM_TYPE_SKIPTO		(totem_skipto_get_type ())
-#define TOTEM_SKIPTO(obj)		(GTK_CHECK_CAST ((obj), TOTEM_TYPE_SKIPTO, TotemSkipto))
-#define TOTEM_SKIPTO_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SKIPTO, TotemSkiptoClass))
-#define TOTEM_IS_SKIPTO(obj)		(GTK_CHECK_TYPE ((obj), TOTEM_TYPE_SKIPTO))
-#define TOTEM_IS_SKIPTO_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SKIPTO))
+#define TOTEM_SKIPTO(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_SKIPTO, TotemSkipto))
+#define TOTEM_SKIPTO_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SKIPTO, TotemSkiptoClass))
+#define TOTEM_IS_SKIPTO(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_SKIPTO))
+#define TOTEM_IS_SKIPTO_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SKIPTO))
 
 GType totem_skipto_register_type	(GTypeModule *module);
 
@@ -58,7 +58,7 @@ struct TotemSkiptoClass {
 	GtkDialogClass parent_class;
 };
 
-GtkType totem_skipto_get_type	(void);
+GType totem_skipto_get_type	(void);
 GtkWidget *totem_skipto_new	(TotemSkiptoPlugin *plugin);
 gint64 totem_skipto_get_range	(TotemSkipto *skipto);
 void totem_skipto_update_range	(TotemSkipto *skipto, gint64 time);
diff --git a/src/totem-open-location.h b/src/totem-open-location.h
index 43bc5210..7dc531cf 100644
--- a/src/totem-open-location.h
+++ b/src/totem-open-location.h
@@ -35,10 +35,10 @@
 G_BEGIN_DECLS
 
 #define TOTEM_TYPE_OPEN_LOCATION		(totem_open_location_get_type ())
-#define TOTEM_OPEN_LOCATION(obj)		(GTK_CHECK_CAST ((obj), TOTEM_TYPE_OPEN_LOCATION, TotemOpenLocation))
-#define TOTEM_OPEN_LOCATION_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_OPEN_LOCATION, TotemOpenLocationClass))
-#define TOTEM_IS_OPEN_LOCATION(obj)		(GTK_CHECK_TYPE ((obj), TOTEM_TYPE_OPEN_LOCATION))
-#define TOTEM_IS_OPEN_LOCATION_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_OPEN_LOCATION))
+#define TOTEM_OPEN_LOCATION(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_OPEN_LOCATION, TotemOpenLocation))
+#define TOTEM_OPEN_LOCATION_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_OPEN_LOCATION, TotemOpenLocationClass))
+#define TOTEM_IS_OPEN_LOCATION(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_OPEN_LOCATION))
+#define TOTEM_IS_OPEN_LOCATION_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_OPEN_LOCATION))
 
 typedef struct TotemOpenLocation		TotemOpenLocation;
 typedef struct TotemOpenLocationClass		TotemOpenLocationClass;
@@ -53,7 +53,7 @@ struct TotemOpenLocationClass {
 	GtkDialogClass parent_class;
 };
 
-GtkType totem_open_location_get_type		(void);
+GType totem_open_location_get_type		(void);
 GtkWidget *totem_open_location_new		(Totem *totem);
 char *totem_open_location_get_uri		(TotemOpenLocation *open_location);
 
diff --git a/src/totem-playlist.h b/src/totem-playlist.h
index 61f1a01f..36b9b351 100644
--- a/src/totem-playlist.h
+++ b/src/totem-playlist.h
@@ -30,10 +30,10 @@
 G_BEGIN_DECLS
 
 #define TOTEM_TYPE_PLAYLIST            (totem_playlist_get_type ())
-#define TOTEM_PLAYLIST(obj)            (GTK_CHECK_CAST ((obj), TOTEM_TYPE_PLAYLIST, TotemPlaylist))
-#define TOTEM_PLAYLIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_PLAYLIST, TotemPlaylistClass))
-#define TOTEM_IS_PLAYLIST(obj)         (GTK_CHECK_TYPE ((obj), TOTEM_TYPE_PLAYLIST))
-#define TOTEM_IS_PLAYLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_PLAYLIST))
+#define TOTEM_PLAYLIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_PLAYLIST, TotemPlaylist))
+#define TOTEM_PLAYLIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_PLAYLIST, TotemPlaylistClass))
+#define TOTEM_IS_PLAYLIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_PLAYLIST))
+#define TOTEM_IS_PLAYLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_PLAYLIST))
 
 typedef enum {
 	TOTEM_PLAYLIST_STATUS_NONE,
@@ -74,7 +74,7 @@ struct TotemPlaylistClass {
 	void (*item_removed) (TotemPlaylist *playlist, const gchar *filename, const gchar *uri);
 };
 
-GtkType    totem_playlist_get_type (void);
+GType    totem_playlist_get_type (void);
 GtkWidget *totem_playlist_new      (void);
 
 /* The application is responsible for checking that the mrl is correct
diff --git a/src/totem-screenshot.h b/src/totem-screenshot.h
index 1886e0cb..d6e82fe6 100644
--- a/src/totem-screenshot.h
+++ b/src/totem-screenshot.h
@@ -28,10 +28,10 @@
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SCREENSHOT            (totem_screenshot_get_type ())
-#define TOTEM_SCREENSHOT(obj)          (GTK_CHECK_CAST ((obj), GTK_TYPE_SCREENSHOT, TotemScreenshot))
-#define TOTEM_SCREENSHOT_CLASS(klass)  (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCREENSHOT, TotemScreenshotClass))
-#define GTK_IS_SCREENSHOT(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_SCREENSHOT))
-#define GTK_IS_SCREENSHOT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCREENSHOT))
+#define TOTEM_SCREENSHOT(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCREENSHOT, TotemScreenshot))
+#define TOTEM_SCREENSHOT_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCREENSHOT, TotemScreenshotClass))
+#define GTK_IS_SCREENSHOT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCREENSHOT))
+#define GTK_IS_SCREENSHOT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCREENSHOT))
 
 typedef struct TotemScreenshot	       TotemScreenshot;
 typedef struct TotemScreenshotClass    TotemScreenshotClass;
@@ -46,7 +46,7 @@ struct TotemScreenshotClass {
 	GtkDialogClass parent_class;
 };
 
-GtkType    totem_screenshot_get_type (void);
+GType    totem_screenshot_get_type (void);
 GtkWidget *totem_screenshot_new      (GdkPixbuf *playing_pix);
 
 G_END_DECLS
diff --git a/src/totem-time-label.h b/src/totem-time-label.h
index 1afdb86a..f080135d 100644
--- a/src/totem-time-label.h
+++ b/src/totem-time-label.h
@@ -5,10 +5,10 @@
 #include <gtk/gtklabel.h>
 
 #define TOTEM_TYPE_TIME_LABEL            (totem_time_label_get_type ())
-#define TOTEM_TIME_LABEL(obj)            (GTK_CHECK_CAST ((obj), TOTEM_TYPE_TIME_LABEL, TotemTimeLabel))
-#define TOTEM_TIME_LABEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_TIME_LABEL, TotemTimeLabelClass))
-#define TOTEM_IS_TIME_LABEL(obj)         (GTK_CHECK_TYPE ((obj), TOTEM_TYPE_TIME_LABEL))
-#define TOTEM_IS_TIME_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_TIME_LABEL))
+#define TOTEM_TIME_LABEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_TIME_LABEL, TotemTimeLabel))
+#define TOTEM_TIME_LABEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_TIME_LABEL, TotemTimeLabelClass))
+#define TOTEM_IS_TIME_LABEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_TIME_LABEL))
+#define TOTEM_IS_TIME_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_TIME_LABEL))
 
 typedef struct TotemTimeLabel	      TotemTimeLabel;
 typedef struct TotemTimeLabelClass    TotemTimeLabelClass;
@@ -23,7 +23,7 @@ struct TotemTimeLabelClass {
 	GtkLabelClass parent_class;
 };
 
-GtkType    totem_time_label_get_type 	(void);
+GType    totem_time_label_get_type 	(void);
 GtkWidget *totem_time_label_new      	(void);
 void       totem_time_label_set_time    (TotemTimeLabel *label,
 					 gint64 time, gint64 length);