From c76e5804b31700aebd352111650a97aec57f92bf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Sun, 13 Nov 2011 23:44:23 +0000
Subject: [PATCH] Update for GstURIHandler get_protocols() changes

---
 ext/gio/gstgio.c                          | 6 +++---
 gst-libs/gst/app/gstappsink.c             | 5 +++--
 gst-libs/gst/app/gstappsrc.c              | 4 ++--
 gst-libs/gst/audio/gstaudiocdsrc.c        | 4 ++--
 tests/check/elements/playbin-compressed.c | 4 ++--
 tests/check/elements/playbin.c            | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ext/gio/gstgio.c b/ext/gio/gstgio.c
index 1b0ea70..96aea35 100644
--- a/ext/gio/gstgio.c
+++ b/ext/gio/gstgio.c
@@ -150,13 +150,13 @@ gst_gio_uri_handler_get_type_src (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_gio_uri_handler_get_protocols (GType type)
 {
-  static gchar **protocols = NULL;
+  static const gchar *const *protocols = NULL;
 
   if (!protocols)
-    protocols = gst_gio_get_supported_protocols ();
+    protocols = (const gchar * const *) gst_gio_get_supported_protocols ();
 
   return protocols;
 }
diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index 422ea1c..3bfcd59 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -1364,10 +1364,10 @@ gst_app_sink_uri_get_type (GType type)
   return GST_URI_SINK;
 }
 
-static gchar **
+static const gchar *const *
 gst_app_sink_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "appsink", NULL };
+  static const gchar *protocols[] = { "appsink", NULL };
 
   return protocols;
 }
@@ -1395,4 +1395,5 @@ gst_app_sink_uri_handler_init (gpointer g_iface, gpointer iface_data)
   iface->get_protocols = gst_app_sink_uri_get_protocols;
   iface->get_uri = gst_app_sink_uri_get_uri;
   iface->set_uri = gst_app_sink_uri_set_uri;
+
 }
diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index c0e4e98..9e4d11c 100644
--- a/gst-libs/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
@@ -1611,10 +1611,10 @@ gst_app_src_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_app_src_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "appsrc", NULL };
+  static const gchar *protocols[] = { "appsrc", NULL };
 
   return protocols;
 }
diff --git a/gst-libs/gst/audio/gstaudiocdsrc.c b/gst-libs/gst/audio/gstaudiocdsrc.c
index 742e26b..4909e06 100644
--- a/gst-libs/gst/audio/gstaudiocdsrc.c
+++ b/gst-libs/gst/audio/gstaudiocdsrc.c
@@ -897,10 +897,10 @@ gst_audio_cd_src_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_audio_cd_src_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "cdda", NULL };
+  static const gchar *protocols[] = { "cdda", NULL };
 
   return protocols;
 }
diff --git a/tests/check/elements/playbin-compressed.c b/tests/check/elements/playbin-compressed.c
index 4a015f9..c7c25f2 100644
--- a/tests/check/elements/playbin-compressed.c
+++ b/tests/check/elements/playbin-compressed.c
@@ -58,10 +58,10 @@ gst_caps_src_uri_get_type (void)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_caps_src_uri_get_protocols (void)
 {
-  static gchar *protocols[] = { (char *) "caps", NULL };
+  static const gchar *protocols[] = { "caps", NULL };
 
   return protocols;
 }
diff --git a/tests/check/elements/playbin.c b/tests/check/elements/playbin.c
index 22a413f..54176fc 100644
--- a/tests/check/elements/playbin.c
+++ b/tests/check/elements/playbin.c
@@ -515,10 +515,10 @@ gst_red_video_src_uri_get_type (void)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_red_video_src_uri_get_protocols (void)
 {
-  static gchar *protocols[] = { (char *) "redvideo", NULL };
+  static const gchar *protocols[] = { "redvideo", NULL };
 
   return protocols;
 }
-- 
2.7.4