4 files changed, 8 insertions, 8 deletions
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index 4b1097b0..5b0f714a 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -404,7 +404,7 @@ gst_esdmon_open_audio (GstEsdmon * src)
     return FALSE;
   }
 
-  GST_FLAG_SET (src, GST_ESDMON_OPEN);
+  GST_OBJECT_FLAG_SET (src, GST_ESDMON_OPEN);
 
   return TRUE;
 }
@@ -418,7 +418,7 @@ gst_esdmon_close_audio (GstEsdmon * src)
   close (src->fd);
   src->fd = -1;
 
-  GST_FLAG_UNSET (src, GST_ESDMON_OPEN);
+  GST_OBJECT_FLAG_UNSET (src, GST_ESDMON_OPEN);
 
   GST_DEBUG ("esdmon: closed sound device");
 }
@@ -430,11 +430,11 @@ gst_esdmon_change_state (GstElement * element, GstStateChange transition)
 
   /* if going down into NULL state, close the fd if it's open */
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
-    if (GST_FLAG_IS_SET (element, GST_ESDMON_OPEN))
+    if (GST_OBJECT_FLAG_IS_SET (element, GST_ESDMON_OPEN))
       gst_esdmon_close_audio (GST_ESDMON (element));
     /* otherwise (READY or higher) we need to open the fd */
   } else {
-    if (!GST_FLAG_IS_SET (element, GST_ESDMON_OPEN)) {
+    if (!GST_OBJECT_FLAG_IS_SET (element, GST_ESDMON_OPEN)) {
       if (!gst_esdmon_open_audio (GST_ESDMON (element)))
         return GST_STATE_CHANGE_FAILURE;
     }
diff --git a/ext/esd/esdmon.h b/ext/esd/esdmon.h
index f50e6544..06cb4fbf 100644
--- a/ext/esd/esdmon.h
+++ b/ext/esd/esdmon.h
@@ -39,8 +39,8 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDMON))
 
 typedef enum {
-  GST_ESDMON_OPEN            = GST_ELEMENT_FLAG_LAST,
-  GST_ESDMON_FLAG_LAST       = GST_ELEMENT_FLAG_LAST+2,
+  GST_ESDMON_OPEN            = (GST_ELEMENT_FLAG_LAST << 0),
+  GST_ESDMON_FLAG_LAST       = (GST_ELEMENT_FLAG_LAST << 2)
 } GstEsdSrcFlags;
 
 typedef struct _GstEsdmon GstEsdmon;
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c
index 361f08cd..b144827c 100644
--- a/ext/gdk_pixbuf/gstgdkpixbuf.c
+++ b/ext/gdk_pixbuf/gstgdkpixbuf.c
@@ -249,7 +249,7 @@ gst_gdk_pixbuf_init (GstGdkPixbuf * filter)
   gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
   gst_pad_set_chain_function (filter->sinkpad, gst_gdk_pixbuf_chain);
 
-  GST_FLAG_SET (GST_ELEMENT (filter), GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (GST_ELEMENT (filter), GST_ELEMENT_EVENT_AWARE);
 }
 
 static void
diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c
index f3e3ea21..807dac27 100644
--- a/ext/pango/gsttextoverlay.c
+++ b/ext/pango/gsttextoverlay.c
@@ -694,7 +694,7 @@ gst_textoverlay_init (GstTextOverlay * overlay)
 
   gst_element_set_loop_function (GST_ELEMENT (overlay), gst_textoverlay_loop);
 
-  GST_FLAG_SET (overlay, GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (overlay, GST_ELEMENT_EVENT_AWARE);
 }