gst/gsturi.c: Use the get_protocols_full vfunc if get_protocols is NULL. Fixes

Original commit message from CVS:
* gst/gsturi.c: (gst_uri_handler_get_protocols):
Use the get_protocols_full vfunc if get_protocols is NULL.  Fixes
URIHandlers implemented using language bindings.

diff --git a/ChangeLog b/ChangeLog
index e5e8149941e3828729568c9f0fb574c89a4fed7e..ccfe4f3c19c44fcd3b4bae622935384122ef9185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-29  Rene Stadler  <mail@renestadler.de>
+
+       * gst/gsturi.c: (gst_uri_handler_get_protocols):
+       Use the get_protocols_full vfunc if get_protocols is NULL.  Fixes
+       URIHandlers implemented using language bindings.
+
 2008-02-29  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * gst/gstelementfactory.h:

diff --git a/gst/gsturi.c b/gst/gsturi.c
index 31f8f1c5ff958e39d493f5de3943249ee0540d91..33727c3cd23ed5d3ab2a249393a0ea4df0c76bff 100644 (file)
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -662,8 +662,14 @@ gst_uri_handler_get_protocols (GstURIHandler * handler)
 
   iface = GST_URI_HANDLER_GET_INTERFACE (handler);
   g_return_val_if_fail (iface != NULL, NULL);
-  g_return_val_if_fail (iface->get_protocols != NULL, NULL);
-  ret = iface->get_protocols ();
+  g_return_val_if_fail (iface->get_protocols != NULL ||
+      iface->get_protocols_full != NULL, NULL);
+
+  if (iface->get_protocols != NULL) {
+    ret = iface->get_protocols ();
+  } else {
+    ret = iface->get_protocols_full (G_OBJECT_TYPE (handler));
+  }
   g_return_val_if_fail (ret != NULL, NULL);
 
   return ret;