From c27bbe4be225cf2c397e424de231e35f75cf8797 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:42:44 +0000
Subject: [PATCH] Update for GstURIHandler get_protocols() changes

---
 ext/soup/gstsouphttpsrc.c       | 5 +++--
 gst/debugutils/gstpushfilesrc.c | 4 ++--
 gst/rtsp/gstrtspsrc.c           | 4 ++--
 gst/udp/gstudpsink.c            | 4 ++--
 gst/udp/gstudpsrc.c             | 4 ++--
 sys/v4l2/gstv4l2radio.c         | 5 +++--
 sys/v4l2/gstv4l2src.c           | 4 ++--
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c
index 52fadd4..af37c33 100644
--- a/ext/soup/gstsouphttpsrc.c
+++ b/ext/soup/gstsouphttpsrc.c
@@ -1447,11 +1447,12 @@ gst_soup_http_src_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_soup_http_src_uri_get_protocols (GType type)
 {
   static const gchar *protocols[] = { "http", "https", NULL };
-  return (gchar **) protocols;
+
+  return protocols;
 }
 
 static gchar *
diff --git a/gst/debugutils/gstpushfilesrc.c b/gst/debugutils/gstpushfilesrc.c
index c6f403e..2718d5c 100644
--- a/gst/debugutils/gstpushfilesrc.c
+++ b/gst/debugutils/gstpushfilesrc.c
@@ -146,10 +146,10 @@ gst_push_file_src_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_push_file_src_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "pushfile", NULL };
+  static const gchar *protocols[] = { "pushfile", NULL };
 
   return protocols;
 }
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 1822f22..88f4152 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -6658,13 +6658,13 @@ gst_rtspsrc_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_rtspsrc_uri_get_protocols (GType type)
 {
   static const gchar *protocols[] =
       { "rtsp", "rtspu", "rtspt", "rtsph", "rtsp-sdp", NULL };
 
-  return (gchar **) protocols;
+  return protocols;
 }
 
 static gchar *
diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c
index 532af4f..036662f 100644
--- a/gst/udp/gstudpsink.c
+++ b/gst/udp/gstudpsink.c
@@ -214,10 +214,10 @@ gst_udpsink_uri_get_type (GType type)
   return GST_URI_SINK;
 }
 
-static gchar **
+static const gchar *const *
 gst_udpsink_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "udp", NULL };
+  static const gchar *protocols[] = { "udp", NULL };
 
   return protocols;
 }
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 2439064..9169d6b 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -1019,10 +1019,10 @@ gst_udpsrc_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_udpsrc_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "udp", NULL };
+  static const gchar *protocols[] = { "udp", NULL };
 
   return protocols;
 }
diff --git a/sys/v4l2/gstv4l2radio.c b/sys/v4l2/gstv4l2radio.c
index d5aecc9..d6f7c8f 100644
--- a/sys/v4l2/gstv4l2radio.c
+++ b/sys/v4l2/gstv4l2radio.c
@@ -512,10 +512,11 @@ gst_v4l2radio_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_v4l2radio_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "radio", NULL };
+  static const gchar *protocols[] = { "radio", NULL };
+
   return protocols;
 }
 
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index e3b1d0f..6f13b28 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -823,10 +823,10 @@ gst_v4l2src_uri_get_type (GType type)
   return GST_URI_SRC;
 }
 
-static gchar **
+static const gchar *const *
 gst_v4l2src_uri_get_protocols (GType type)
 {
-  static gchar *protocols[] = { (char *) "v4l2", NULL };
+  static const gchar *protocols[] = { "v4l2", NULL };
 
   return protocols;
 }
-- 
2.7.4