diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-09-29 05:26:54 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-09-29 05:26:54 +0000 |
| commit | 453fef95a1527997e6e360d134ed7087a4773876 (patch) | |
| tree | f03ee917f06e714015ca637058a6de70a91a3f4e | |
| parent | 3668cfd91e87b70b41c3bad832d8486f55b9cd77 (diff) | |
| download | gst-plugins-bad-453fef95a1527997e6e360d134ed7087a4773876.tar.gz gst-plugins-bad-453fef95a1527997e6e360d134ed7087a4773876.tar.bz2 gst-plugins-bad-453fef95a1527997e6e360d134ed7087a4773876.zip | |
configure.ac: Update gio's pkg-config file name as currently in SVN.
Original commit message from CVS:
* configure.ac:
Update gio's pkg-config file name as currently in SVN.
* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_set_location):
Remove special casing for a NULL query string. g_strjoin won't add
the separator if there's only one string.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ext/neon/gstneonhttpsrc.c | 5 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,12 @@ +2007-09-29 Sebastian Dröge <slomo@circular-chaos.org> + + * configure.ac: + Update gio's pkg-config file name as currently in SVN. + + * ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_set_location): + Remove special casing for a NULL query string. g_strjoin won't add + the separator if there's only one string. + 2007-09-28 Wim Taymans <wim.taymans@gmail.com> * gst/rtpmanager/gstrtpbin.c: (free_client): diff --git a/configure.ac b/configure.ac index 64984a1f..18677779 100644 --- a/configure.ac +++ b/configure.ac @@ -531,8 +531,8 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ dnl *** libgio *** translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true) -AG_GST_CHECK_FEATURE(GIO, [GIO standalone library], gio, [ - PKG_CHECK_MODULES(GIO, gio-standalone >= 0.0.1, HAVE_GIO="yes", [ +AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [ + PKG_CHECK_MODULES(GIO, gio-2.0 >= 0.1, HAVE_GIO="yes", [ HAVE_GIO="no" AC_MSG_RESULT(no) ]) diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c index 0172a4a9..1d3a22f0 100644 --- a/ext/neon/gstneonhttpsrc.c +++ b/ext/neon/gstneonhttpsrc.c @@ -729,10 +729,7 @@ gst_neonhttp_src_set_location (GstNeonhttpSrc * src, const gchar * uri) if (!src->uri.path) src->uri.path = g_strdup (""); - if (src->uri.query) - src->query_string = g_strjoin ("?", src->uri.path, src->uri.query, NULL); - else - src->query_string = g_strdup (src->uri.path); + src->query_string = g_strjoin ("?", src->uri.path, src->uri.query, NULL); src->location = ne_uri_unparse (&src->uri); |