X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=841bda5a96706411ef24198fe25320c87dcc3722;hb=e294a372f351d7105c21a2db58022af8b119aa64;hp=061e4dc77668be0c431fcbee3e8e7d0a1b9299f5;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 061e4dc776..841bda5a96 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,10 +1,12 @@
-
 #include "helper.h"
-#include "data-in.h"
-#include "message.h"
+#include <data/data-in.h>
+#include <libpspp/message.h>
+
+#include <libpspp/i18n.h>
 
 #include <ctype.h>
 #include <string.h>
+#include <data/settings.h>
 
 /* Formats a value according to FORMAT 
    The returned string must be freed when no longer required */
@@ -35,16 +37,18 @@ text_to_value(const gchar *text, union value *v,
   if ( format.type != FMT_A) 
     {
       if ( ! text ) return FALSE;
-  
-      const gchar *s = text;
-      while(*s) 
-	{
-	  if ( !isspace(*s))
-	    break;
-	  s++;
-	}
+
+      {
+	const gchar *s = text;
+	while(*s) 
+	  {
+	    if ( !isspace(*s))
+	      break;
+	    s++;
+	  }
  
-      if ( !*s) return FALSE;
+	if ( !*s) return FALSE;
+      }
     }
 
   di.s = text;
@@ -62,13 +66,22 @@ text_to_value(const gchar *text, union value *v,
 GtkWidget *
 get_widget_assert(GladeXML *xml, const gchar *name)
 {
+  GtkWidget *w;
   g_assert(xml);
   g_assert(name);
-  GtkWidget * w = glade_xml_get_widget(xml, name);
+  
+  w = glade_xml_get_widget(xml, name);
 
   if ( !w ) 
-    g_warning("Widget \"%s\" could not be found\n",name);
+    g_warning("Widget \"%s\" could not be found\n", name);
 
   return w;
 }
 
+/* Converts a string in the pspp locale to utf-8 */
+char *
+pspp_locale_to_utf8(const gchar *text, gssize len, GError **err)
+{
+  return recode_string(CONV_PSPP_TO_UTF8, text, len);
+}
+