From 028b73a7c053c8a53de8153030ea225bd31bac7d Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 3 Feb 2009 10:04:55 +0000 Subject: Fix naming of macros to be consistent with the class name svn path=/trunk/; revision=2418 --- libempathy-gtk/empathy-video-widget.c | 6 +++--- libempathy-gtk/empathy-video-widget.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libempathy-gtk/empathy-video-widget.c b/libempathy-gtk/empathy-video-widget.c index c92f6fe00..f2465854b 100644 --- a/libempathy-gtk/empathy-video-widget.c +++ b/libempathy-gtk/empathy-video-widget.c @@ -71,7 +71,7 @@ struct _EmpathyVideoWidgetPriv }; #define GET_PRIV(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ - EMPATHY_TYPE_GST_GTK_WIDGET, EmpathyVideoWidgetPriv)) + EMPATHY_TYPE_VIDEO_WIDGET, EmpathyVideoWidgetPriv)) static void empathy_video_widget_init (EmpathyVideoWidget *obj) @@ -320,7 +320,7 @@ empathy_video_widget_new_with_size (GstBus *bus, gint width, gint height) { g_return_val_if_fail (bus != NULL, NULL); - return GTK_WIDGET (g_object_new (EMPATHY_TYPE_GST_GTK_WIDGET, + return GTK_WIDGET (g_object_new (EMPATHY_TYPE_VIDEO_WIDGET, "gst-bus", bus, "min-width", width, "min-height", height, @@ -332,7 +332,7 @@ empathy_video_widget_new (GstBus *bus) { g_return_val_if_fail (bus != NULL, NULL); - return GTK_WIDGET (g_object_new (EMPATHY_TYPE_GST_GTK_WIDGET, + return GTK_WIDGET (g_object_new (EMPATHY_TYPE_VIDEO_WIDGET, "gst-bus", bus, NULL)); } diff --git a/libempathy-gtk/empathy-video-widget.h b/libempathy-gtk/empathy-video-widget.h index ed7ed5be5..08acdaa71 100644 --- a/libempathy-gtk/empathy-video-widget.h +++ b/libempathy-gtk/empathy-video-widget.h @@ -41,20 +41,20 @@ struct _EmpathyVideoWidget { GType empathy_video_widget_get_type (void); /* TYPE MACROS */ -#define EMPATHY_TYPE_GST_GTK_WIDGET \ +#define EMPATHY_TYPE_VIDEO_WIDGET \ (empathy_video_widget_get_type()) #define EMPATHY_VIDEO_WIDGET(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_GST_GTK_WIDGET, \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_VIDEO_WIDGET, \ EmpathyVideoWidget)) #define EMPATHY_VIDEO_WIDGET_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_GST_GTK_WIDGET, \ + (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_VIDEO_WIDGET, \ EmpathyVideoWidgetClass)) -#define EMPATHY_IS_GST_GTK_WIDGET(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_GST_GTK_WIDGET)) -#define EMPATHY_IS_GST_GTK_WIDGET_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_GST_GTK_WIDGET)) +#define EMPATHY_IS_VIDEO_WIDGET(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_VIDEO_WIDGET)) +#define EMPATHY_IS_VIDEO_WIDGET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_VIDEO_WIDGET)) #define EMPATHY_VIDEO_WIDGET_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_GST_GTK_WIDGET, \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_VIDEO_WIDGET, \ EmpathyVideoWidgetClass)) GtkWidget *empathy_video_widget_new (GstBus *bus); -- cgit v1.2.3