glibmm r621 - in trunk: . glib/src

[wbolster svn gnome org]

Author: wbolster
Date: Mon Feb 25 15:55:21 2008
New Revision: 621
URL: http://svn.gnome.org/viewvc/glibmm?rev=621&view=rev

Log:
2008-02-25  Wouter Bolsterlee  <wbolster svn gnome org>

	* glib/src/uriutils.ccg:
	* glib/src/uriutils.hg:

	g_uri_get_scheme has been renamed to g_uri_parse_scheme
	in GLib trunk. Updated accordingly.


Modified:
   trunk/ChangeLog
   trunk/glib/src/uriutils.ccg
   trunk/glib/src/uriutils.hg

Modified: trunk/glib/src/uriutils.ccg
==============================================================================
--- trunk/glib/src/uriutils.ccg	(original)
+++ trunk/glib/src/uriutils.ccg	Mon Feb 25 15:55:21 2008
@@ -30,9 +30,9 @@
   return Glib::convert_const_gchar_ptr_to_stdstring(cresult);
 }
 
-std::string uri_get_scheme(const std::string& uri)
+std::string uri_parse_scheme(const std::string& uri)
 {
-  return Glib::convert_const_gchar_ptr_to_stdstring( g_uri_get_scheme(uri.c_str()) );
+  return Glib::convert_const_gchar_ptr_to_stdstring( g_uri_parse_scheme(uri.c_str()) );
 }
 
 std::string uri_escape_string(const std::string& unescaped, const std::string& reserved_chars_allowed, bool allow_utf8)

Modified: trunk/glib/src/uriutils.hg
==============================================================================
--- trunk/glib/src/uriutils.hg	(original)
+++ trunk/glib/src/uriutils.hg	Mon Feb 25 15:55:21 2008
@@ -68,7 +68,7 @@
  * @ingroup UriUtils
  * @newin2p16
  */
-std::string uri_get_scheme(const std::string& uri);
+std::string uri_parse_scheme(const std::string& uri);
 
 /** Escapes a string for use in a URI.
  *