glibmm r772 - in branches/glibmm-2-18: . glib/src

[jjongsma svn gnome org]

Author: jjongsma
Date: Wed Jan  7 05:34:38 2009
New Revision: 772
URL: http://svn.gnome.org/viewvc/glibmm?rev=772&view=rev

Log:
Bug 566845 â Leaks found in glibmm uriutils.cc


Modified:
   branches/glibmm-2-18/ChangeLog
   branches/glibmm-2-18/glib/src/uriutils.ccg

Modified: branches/glibmm-2-18/glib/src/uriutils.ccg
==============================================================================
--- branches/glibmm-2-18/glib/src/uriutils.ccg	(original)
+++ branches/glibmm-2-18/glib/src/uriutils.ccg	Wed Jan  7 05:34:38 2009
@@ -26,19 +26,19 @@
 
 std::string uri_unescape_string(const std::string& escaped_string, const std::string& illegal_characters)
 {
-  const gchar* cresult = g_uri_unescape_string(escaped_string.c_str(), illegal_characters.c_str());
-  return Glib::convert_const_gchar_ptr_to_stdstring(cresult);
+  gchar* cresult = g_uri_unescape_string(escaped_string.c_str(), illegal_characters.c_str());
+  return Glib::convert_return_gchar_ptr_to_stdstring(cresult);
 }
 
 std::string uri_parse_scheme(const std::string& uri)
 {
-  return Glib::convert_const_gchar_ptr_to_stdstring( g_uri_parse_scheme(uri.c_str()) );
+  return Glib::convert_return_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)
 {
-  const gchar* cresult = g_uri_escape_string(unescaped.c_str(), reserved_chars_allowed.c_str(), allow_utf8);
-  return Glib::convert_const_gchar_ptr_to_stdstring(cresult);
+  gchar* cresult = g_uri_escape_string(unescaped.c_str(), reserved_chars_allowed.c_str(), allow_utf8);
+  return Glib::convert_return_gchar_ptr_to_stdstring(cresult);
 }
 
 } // namespace Glib