From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sun, 26 Jun 2011 20:27:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 0.11
X-Git-Tag: RELEASE-0.11.0~65
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac6c07a955b413ac0a48dbae5ea363b9358f2e10;p=platform%2Fupstream%2Fgst-plugins-base.git

Merge remote-tracking branch 'origin/master' into 0.11
---

ac6c07a955b413ac0a48dbae5ea363b9358f2e10
diff --cc tests/check/libs/navigation.c
index db64473,1f143a3..893ed0b
--- a/tests/check/libs/navigation.c
+++ b/tests/check/libs/navigation.c
@@@ -92,24 -89,8 +84,8 @@@ test_element_class_init (TestElementCla
  {
  }
  
- static gboolean
- test_element_interface_supported (GstImplementsInterface * ifacE,
-     GType interface_type)
- {
-   if (interface_type == GST_TYPE_NAVIGATION)
-     return TRUE;
- 
-   return FALSE;
- }
- 
- static void
- gst_implements_interface_init (GstImplementsInterfaceClass * klass)
- {
-   klass->supported = test_element_interface_supported;
- }
- 
  static void
 -test_element_init (TestElement * this, TestElementClass * klass)
 +test_element_init (TestElement * this)
  {
  }