From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Sat, 2 Jun 2012 18:01:01 +0000 (+0200)
Subject: Revert "pad: Return FALSE if pushing of sticky events failed"
X-Git-Tag: RELEASE-0.11.92~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e6b5c7acf058908eae2bcb602ad6ab057db2e03;p=platform%2Fupstream%2Fgstreamer.git

Revert "pad: Return FALSE if pushing of sticky events failed"

This reverts commit 0f924b922c712059d7752fc15b832551745ff27e.

Sticky events should always return TRUE when pushing and will
only cause failures during data flow later.
---

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 79bbb2e..ad44d83 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -4447,7 +4447,7 @@ idle_probe_stopped:
 gboolean
 gst_pad_push_event (GstPad * pad, GstEvent * event)
 {
-  gboolean res = TRUE;
+  gboolean res;
   GstPadProbeType type;
   gboolean sticky, serialized;
 
@@ -4487,13 +4487,12 @@ gst_pad_push_event (GstPad * pad, GstEvent * event)
      * sticky events */
     res = (check_sticky (pad) == GST_FLOW_OK);
   }
-
-  /* If pushing sticky events did not fail and this is no sticky event
-   * push it right away */
-  if (res && !sticky) {
+  if (!sticky) {
+    /* other events are pushed right away */
     res = (gst_pad_push_event_unchecked (pad, event, type) == GST_FLOW_OK);
   } else {
     gst_event_unref (event);
+    res = TRUE;
   }
   GST_OBJECT_UNLOCK (pad);