Wow error message dialog, double UTF-8 coversion avoided

xtt/lib/cow/gtk/cow_wow_gtk.cpp

@@ -323,7 +323,7 @@ static gboolean displayerror_remove_cb( void *data)
   return FALSE;
 }
 
-void CoWowGtk::DisplayError( const char *title, const char *text)
+void CoWowGtk::DisplayError( const char *title, const char *text, lng_eCoding coding)
 {
   GtkWidget *parent = m_parent;
   if ( parent) {
@@ -331,15 +331,21 @@ void CoWowGtk::DisplayError( const char *title, const char *text)
       parent = gtk_widget_get_parent( parent);
   }
 
-  char *textutf8 = g_convert( text, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
-  if ( textutf8[0] == '%')
-    textutf8[0] = ' ';
+  char *ctext; 
+  if ( coding != lng_eCoding_UTF_8) {
+    ctext = g_convert( text, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+    if ( ctext[0] == '%')
+      ctext[0] = ' ';
+  }  
+  else
+    ctext = (char *)text;
 
   GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(parent),
 					      GTK_DIALOG_MODAL, 
 					      GTK_MESSAGE_ERROR,
-					      GTK_BUTTONS_OK, textutf8);
-  g_free( textutf8);
+					      GTK_BUTTONS_OK, ctext);
+  if ( coding != lng_eCoding_UTF_8)
+    g_free( ctext);
   g_signal_connect( dialog, "response", 
  		    G_CALLBACK(displayerror_ok_cb), NULL);
   gtk_window_set_title( GTK_WINDOW(dialog), title);

xtt/lib/cow/gtk/cow_wow_gtk.h

@@ -126,7 +126,7 @@ class CoWowGtk : public CoWow {
 			void (* questionbox_ok) ( void *, void *),
 			void (* questionbox_cancel) ( void *, void *),
 			void *data);
-  void DisplayError( const char *title, const char *text);
+  void DisplayError( const char *title, const char *text, lng_eCoding coding = lng_eCoding_ISO8859_1);
   void DisplayText( const char *title, const char *text, int width = 0, int height = 0);
   void CreateInputDialog( void *ctx, const char *title, const char *text,
 			  void (* inputdialogbox_ok) ( void *, void *, char *),

xtt/lib/cow/src/cow_wow.h

@@ -41,6 +41,7 @@
 
 #include <string.h>
 #include "co_wow_msg.h"
+#include "co_lng.h"
 
 typedef enum {
   wow_eFileSelType_,
@@ -117,7 +118,7 @@ class CoWow {
 				void (* questionbox_ok) ( void *, void *),
 				void (* questionbox_cancel) ( void *, void *),
 				void *data) {}
-  virtual void DisplayError( const char *title, const char *text) {}
+  virtual void DisplayError( const char *title, const char *text, lng_eCoding coding = lng_eCoding_ISO8859_1) {}
   virtual void DisplayText( const char *title, const char *text, int width = 0, int height = 0) {}
   virtual void CreateInputDialog( void *ctx, const char *title, const char *text,
 				  void (* inputdialogbox_ok) ( void *, void *, char *),

xtt/lib/xtt/gtk/xtt_ge_gtk.cpp

@@ -152,7 +152,7 @@ void XttGeGtk::message_dialog_cb( void *ge_ctx, const char *text)
   char		title[80];
 
   strcpy( title, Lng::translate("Message"));
-  wow.DisplayError( title, Lng::translate(text));
+  wow.DisplayError( title, Lng::translate(text), Lng::translatefile_coding());
 
   // g_object_set( ((XttGeGtk *)ge)->message_dia_widget, "visible", TRUE, NULL);
   // gtk_label_set_text( GTK_LABEL(((XttGeGtk *)ge)->message_dia_label), text);

xtt/lib/xtt/src/xtt_hist.cpp

@@ -52,7 +52,6 @@ using namespace std;
 #include <string>
 #include <vector>
 
-extern "C" {
 #include "co_cdh.h"
 #include "co_time.h"
 #include "cow_wow.h"
@@ -64,7 +63,6 @@ extern "C" {
 #include "rt_elog.h"
 #include "co_dcli.h"
 #include <db.h>
-}
 
 #include <deque>
 #include <algorithm>