From a559801c80c368e4bf0f8615f5d37e3fc3934c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Thu, 6 Apr 2006 09:37:21 +0000
Subject: [PATCH] ext/neon/gstneonhttpsrc.c: Add back "uri" property and mark
 it as deprecated; undoes

Original commit message from CVS:
* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_class_init),
(gst_neonhttp_src_set_property), (gst_neonhttp_src_get_property):
Add back "uri" property and mark it as deprecated; undoes
API/ABI breakage from 2006-02-24.
---
 ChangeLog                 |  7 +++++++
 common                    |  2 +-
 ext/neon/gstneonhttpsrc.c | 11 ++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af32ee9b0e..f7c40e34e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-06  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_class_init),
+	(gst_neonhttp_src_set_property), (gst_neonhttp_src_get_property):
+	  Add back "uri" property and mark it as deprecated; undoes
+	  API/ABI breakage from 2006-02-24.
+
 2006-04-05  Wim Taymans  <wim@fluendo.com>
 
 	* gst/qtdemux/qtdemux.c: (gst_qtdemux_perform_seek),
diff --git a/common b/common
index cbedff4d5f..623fe1c2cc 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit cbedff4d5f090d43fdeaa189748a6651f2c6a07f
+Subproject commit 623fe1c2cce45bc30d5823c05716349874ae994e
diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index c2e5a5aca6..9b05d29935 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -46,6 +46,7 @@ enum
 {
   PROP_0,
   PROP_LOCATION,
+  PROP_URI,
   PROP_PROXY
 };
 
@@ -128,6 +129,11 @@ gst_neonhttp_src_class_init (GstNeonhttpSrcClass * klass)
           "\n\t\t\thttp:///file.txt - default host '" HTTP_DEFAULT_HOST "'",
           "", G_PARAM_READWRITE));
 
+  g_object_class_install_property
+      (G_OBJECT_CLASS (klass), PROP_URI,
+      g_param_spec_string ("uri", "Uri",
+          "The location in form of a URI (deprecated; use location)",
+          "", G_PARAM_READWRITE));
 
   g_object_class_install_property
       (G_OBJECT_CLASS (klass), PROP_PROXY,
@@ -201,7 +207,7 @@ gst_neonhttp_src_finalize (GObject * gobject)
 
 }
 
-int
+static int
 request_dispatch (GstNeonhttpSrc * src, GstBuffer * outbuf, gboolean * eos)
 {
   int ret;
@@ -554,6 +560,7 @@ gst_neonhttp_src_set_property (GObject * object, guint prop_id,
     }
 
       break;
+    case PROP_URI:
     case PROP_LOCATION:
     {
       if (!g_value_get_string (value)) {
@@ -602,6 +609,8 @@ gst_neonhttp_src_get_property (GObject * object, guint prop_id,
       }
     }
       break;
+
+    case PROP_URI:
     case PROP_LOCATION:
     {
       char *str;