glib r6587 - in trunk: . glib
- From: alexl svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r6587 - in trunk: . glib
- Date: Mon, 25 Feb 2008 13:28:44 +0000 (GMT)
Author: alexl
Date: Mon Feb 25 13:28:44 2008
New Revision: 6587
URL: http://svn.gnome.org/viewvc/glib?rev=6587&view=rev
Log:
2008-02-25 Alexander Larsson <alexl redhat com>
* glib/gurifuncs.[ch]:
Rename g_uri_get_scheme to g_uri_parse_scheme.
Keep g_uri_get_scheme() symbol for this
unstable release to avoid breaking to many apps.
Modified:
trunk/ChangeLog
trunk/glib/gurifuncs.c
trunk/glib/gurifuncs.h
Modified: trunk/glib/gurifuncs.c
==============================================================================
--- trunk/glib/gurifuncs.c (original)
+++ trunk/glib/gurifuncs.c Mon Feb 25 13:28:44 2008
@@ -152,10 +152,10 @@
}
/**
- * g_uri_get_scheme:
+ * g_uri_parse_scheme:
* @uri: a valid URI.
*
- * Gets the scheme portion of a URI. RFC 3986 decodes the scheme as:
+ * Gets the scheme portion of a URI string. RFC 3986 decodes the scheme as:
* <programlisting>
* URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
* </programlisting>
@@ -167,7 +167,7 @@
* Since: 2.16
**/
char *
-g_uri_get_scheme (const char *uri)
+g_uri_parse_scheme (const char *uri)
{
const char *p;
char c;
@@ -204,6 +204,15 @@
return g_strndup (uri, p - uri - 1);
}
+/* Temporary add a symbol to avoid crashing to many apps.
+ Remove after 2.15.6 release */
+char * g_uri_get_scheme (const char *uri);
+char *g_uri_get_scheme (const char *uri)
+{
+ return g_uri_parse_scheme (uri);
+}
+
+
/**
* g_uri_escape_string:
* @unescaped: the unescaped input string.
Modified: trunk/glib/gurifuncs.h
==============================================================================
--- trunk/glib/gurifuncs.h (original)
+++ trunk/glib/gurifuncs.h Mon Feb 25 13:28:44 2008
@@ -67,7 +67,7 @@
char * g_uri_unescape_segment (const char *escaped_string,
const char *escaped_string_end,
const char *illegal_characters);
-char * g_uri_get_scheme (const char *uri);
+char * g_uri_parse_scheme (const char *uri);
char * g_uri_escape_string (const char *unescaped,
const char *reserved_chars_allowed,
gboolean allow_utf8);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]