Fix naming of macros to be consistent with the class name

svn path=/trunk/; revision=2418

diff --git a/libempathy-gtk/empathy-video-widget.c b/libempathy-gtk/empathy-video-widget.c
index c92f6fe00ace5c71dacd061a016b61d4a5f6df10..f2465854bd06772d4051b7d03976eb341fdbddb0 100644 (file)
--- 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), \
 };
 
 #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)
 
 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);
 
 {
   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,
     "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);
 
 {
   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));
 }
     "gst-bus", bus,
     NULL));
 }

diff --git a/libempathy-gtk/empathy-video-widget.h b/libempathy-gtk/empathy-video-widget.h
index ed7ed5be5f2436641fd14628ca3519e6d56627a4..08acdaa713071d0a5c4665d74effd299d38553bf 100644 (file)
--- 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 */
 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) \
   (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) \
     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))
   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) \
 #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);
   EmpathyVideoWidgetClass))
 
 GtkWidget *empathy_video_widget_new (GstBus *bus);