diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2010-10-18 17:41:25 -0400 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2010-10-18 17:41:25 -0400 |
| commit | a15e65669782155dde682b67546eb64681c451b6 (patch) | |
| tree | 2ec922aadf5218934d6938d756244ab93ad5d9fb | |
| parent | 60e8aa09d725deac1512e569d6661a1c24a093c2 (diff) | |
| download | glibmm-3maybe.tar.gz | |
glibmm: ustring: Restore last block removed by #ifdef removal script.glibmm-3maybe
* 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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | glib/glibmm/ustring.cc | 7 |
2 files changed, 16 insertions, 1 deletions
@@ -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-07-28 Murray Cumming <murrayc@murrayc.com> KeyFile: Fix a compiler warning. diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc index accf0d7e..62b79d7d 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) { |