[glibmm/glibmm-2-26] glibmm: ustring: Restore last block removed by #ifdef removal script.

[José Alburquerque <jaalburqu src gnome org>]

commit d165b22fdf6c893b5e10d688cf1237a19585f8ab
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Mon Oct 18 17:40:56 2010 -0400

    	glibmm: ustring: Restore last block removed by #ifdef removal script.
    
    	* glib/glibmm/ustring.cc: Restore the last block that was accidentally
    	removed by the optional API #ifdef removal script.  There were three.
    	Two were restored (GNOME bug #622030), but one (final one) was not.
    	This commit does that, restoring the file to its original condition
    	without the optional API #ifdefs.

 ChangeLog              |   10 ++++++++++
 glib/glibmm/ustring.cc |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 72cc8ab..058d620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-18  José Alburquerque  <jaalburqu svn gnome org>
+
+	glibmm: ustring: Restore last block removed by #ifdef removal script.
+
+	* glib/glibmm/ustring.cc: Restore the last block that was accidentally
+	removed by the optional API #ifdef removal script.  There were three.
+	Two were restored (GNOME bug #622030), but one (final one) was not.
+	This commit does that, restoring the file to its original condition
+	without the optional API #ifdefs.
+
 2010-09-28  Armin Burgmeier  <armin arbur net>
 
 	* MSVC_Net2005/examples/compose/compose.vcproj:
diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc
index accf0d7..62b79d7 100644
--- a/glib/glibmm/ustring.cc
+++ b/glib/glibmm/ustring.cc
@@ -1282,7 +1282,12 @@ ustring ustring::FormatStream::to_string() const
                                        "UTF-8", "WCHAR_T", 0, &n_bytes, &error));
 # endif /* !(__STDC_ISO_10646__ || G_OS_WIN32) */
 
-#endif //GLIBMM_EXCEPTIONS_ENABLED
+#else /* !GLIBMM_HAVE_WIDE_STREAM */
+  const std::string str = stream_.str();
+
+  gsize n_bytes = 0;
+  const ScopedPtr<char> buf (g_locale_to_utf8(str.data(), str.size(), 0, &n_bytes, &error));
+#endif /* !GLIBMM_HAVE_WIDE_STREAM */
 
   if (error)
   {