aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2009-02-03 18:04:55 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2009-02-03 18:04:55 +0800
commitfb2d25103a7793e36cc9ff407291656aca51a0fb (patch)
treed578db265c771415aa675928d4f4d8ff8645daa5
parentb5170a64483f8148e8acffacf8aea3b60bdded4c (diff)
downloadgsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.tar
gsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.tar.gz
gsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.tar.bz2
gsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.tar.lz
gsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.tar.xz
gsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.tar.zst
gsoc2013-empathy-fb2d25103a7793e36cc9ff407291656aca51a0fb.zip
Fix naming of macros to be consistent with the class name
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2418 4ee84921-47dd-4033-b63a-18d7a039a3e4
-rw-r--r--libempathy-gtk/empathy-video-widget.c6
-rw-r--r--libempathy-gtk/empathy-video-widget.h16
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);