Commit 8f444279 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Rename g_uri_get_scheme to g_uri_parse_scheme. Keep g_uri_get_scheme()

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.



svn path=/trunk/; revision=6587
parent d8cd5468
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.
2008-02-24 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (_glib_get_installation_directory): New internal function.
......
......@@ -152,10 +152,10 @@ g_uri_unescape_string (const char *escaped_string,
}
/**
* 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 @@ g_uri_unescape_string (const char *escaped_string,
* 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 @@ g_uri_get_scheme (const char *uri)
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.
......
......@@ -67,7 +67,7 @@ char * g_uri_unescape_string (const char *escaped_string,
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment