[glom/glom-1-12] libglom: Fix build issue for Maemo.



commit eb4104d5add6bf128ddedb7cbd4df8dd75d29859
Author: Peter Penz <ppenz openismus com>
Date:   Mon Feb 8 18:13:57 2010 +0100

    libglom: Fix build issue for Maemo.
    
    	* glom/libglom/data_structure/glomconversions.cc: get_text_for_gda_value():
    	Add an ifdef for the disabled-exceptions build.

 ChangeLog                                      |    7 +++++++
 glom/libglom/data_structure/glomconversions.cc |    5 +++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6df16af..938c71a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-08  Peter Penz <ppenz openismus com>
+
+  libglom: Fix build issue for Maemo.
+  
+	* glom/libglom/data_structure/glomconversions.cc: get_text_for_gda_value():
+	Add an ifdef for the disabled-exceptions build.
+	
 1.12.6 (stable):
 
 2010-01-26  Murray Cumming  <murrayc murrayc com>
diff --git a/glom/libglom/data_structure/glomconversions.cc b/glom/libglom/data_structure/glomconversions.cc
index fae7010..7bf57a9 100644
--- a/glom/libglom/data_structure/glomconversions.cc
+++ b/glom/libglom/data_structure/glomconversions.cc
@@ -441,7 +441,12 @@ Glib::ustring Conversions::get_text_for_gda_value(Field::glom_field_type glom_ty
       {
         std::string charset;
         Glib::get_charset(charset);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
         Glib::ustring currency_symbol = Glib::convert_with_fallback(numeric_format.m_currency_symbol, charset, "UTF-8");
+#else
+        std::auto_ptr<Glib::Error> error;
+        Glib::ustring currency_symbol = Glib::convert_with_fallback(numeric_format.m_currency_symbol, charset, "UTF-8", error);
+#endif
         // Uses convert_with_fallback(.) for the curreny symbol to avoid an
         // exception where the operator<<'s automatic conversion fails.
         // Incompatible encodings are possible since the currency symbol itself



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]