[glibmm] FileUtils: Correct my previous commit.

[Murray Cumming <murrayc src gnome org>]

commit 00a2fa0f7f7fa2b998e8812e677a239f5d62ec49
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Mar 29 10:58:47 2011 +0200

    FileUtils: Correct my previous commit.
    
    * glib/src/fileutils.ccg:
    * glib/src/iochannel.ccg: Do not create a ustring instead of a std::string.

 ChangeLog              |    7 +++++++
 glib/src/fileutils.ccg |    3 +--
 glib/src/iochannel.ccg |    5 ++---
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a140c6c..1b505a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-29  Murray Cumming  <murrayc murrayc-desktop>
+
+	FileUtils: Correct my previous commit.
+
+	* glib/src/fileutils.ccg:
+	* glib/src/iochannel.ccg: Do not create a ustring instead of a std::string.
+
 2011-03-29  Murray Cumming  <murrayc murrayc com>
 
 	Use the utility functions for creating strings.
diff --git a/glib/src/fileutils.ccg b/glib/src/fileutils.ccg
index 0fde698..d3690b8 100644
--- a/glib/src/fileutils.ccg
+++ b/glib/src/fileutils.ccg
@@ -95,7 +95,7 @@ DirIterator::DirIterator(GDir* gobject, const char* current)
 
 std::string DirIterator::operator*() const
 {
-  return convert_const_gchar_ptr_to_ustring(current_);
+  return convert_const_gchar_ptr_to_stdstring(current_);
 }
 
 DirIterator& DirIterator::operator++()
@@ -199,4 +199,3 @@ file_set_contents (const std::string& filename, const std::string& contents)
 }
 
 } // namespace Glib
-
diff --git a/glib/src/iochannel.ccg b/glib/src/iochannel.ccg
index 9405727..9571986 100644
--- a/glib/src/iochannel.ccg
+++ b/glib/src/iochannel.ccg
@@ -289,7 +289,7 @@ IOStatus IOChannel::set_encoding(const std::string& encoding)
 std::string IOChannel::get_encoding() const
 {
   const char *const encoding = g_io_channel_get_encoding(gobject_);
-  return convert_const_gchar_ptr_to_ustring(encoding);
+  return convert_const_gchar_ptr_to_stdstring(encoding);
 }
 
 void IOChannel::set_line_term(const std::string& term)
@@ -472,7 +472,7 @@ GIOStatus GlibmmIOChannel::io_close(GIOChannel* channel, GError** err)
   {
     Glib::exception_handlers_invoke();
   }
- 
+
 
   return G_IO_STATUS_ERROR;
 }
@@ -545,4 +545,3 @@ GIOFlags GlibmmIOChannel::io_get_flags(GIOChannel* channel)
 }
 
 } // namespace Glib
-