empathy r2418 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Feb  3 10:04:55 2009
New Revision: 2418
URL: http://svn.gnome.org/viewvc/empathy?rev=2418&view=rev

Log:
Fix naming of macros to be consistent with the class name

Modified:
   trunk/libempathy-gtk/empathy-video-widget.c
   trunk/libempathy-gtk/empathy-video-widget.h

Modified: trunk/libempathy-gtk/empathy-video-widget.c
==============================================================================
--- trunk/libempathy-gtk/empathy-video-widget.c	(original)
+++ trunk/libempathy-gtk/empathy-video-widget.c	Tue Feb  3 10:04:55 2009
@@ -71,7 +71,7 @@
 };
 
 #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 @@
 {
   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 @@
 {
   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));
 }

Modified: trunk/libempathy-gtk/empathy-video-widget.h
==============================================================================
--- trunk/libempathy-gtk/empathy-video-widget.h	(original)
+++ trunk/libempathy-gtk/empathy-video-widget.h	Tue Feb  3 10:04:55 2009
@@ -41,20 +41,20 @@
 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);