projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing "#include <config.h>".
[pspp]
/
src
/
ui
/
gui
/
helper.c
diff --git
a/src/ui/gui/helper.c
b/src/ui/gui/helper.c
index b3d83da270472ea6b62cf3d2ea1405d82870b727..841bda5a96706411ef24198fe25320c87dcc3722 100644
(file)
--- a/
src/ui/gui/helper.c
+++ b/
src/ui/gui/helper.c
@@
-1,10
+1,12
@@
-
#include "helper.h"
#include <data/data-in.h>
#include <libpspp/message.h>
#include "helper.h"
#include <data/data-in.h>
#include <libpspp/message.h>
+#include <libpspp/i18n.h>
+
#include <ctype.h>
#include <string.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 */
/* 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;
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;
}
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 *
get_widget_assert(GladeXML *xml, const gchar *name)
{
+ GtkWidget *w;
g_assert(xml);
g_assert(name);
g_assert(xml);
g_assert(name);
- GtkWidget * w = glade_xml_get_widget(xml, name);
+
+ w = glade_xml_get_widget(xml, name);
if ( !w )
if ( !w )
- g_warning("Widget \"%s\" could not be found\n",name);
+ g_warning("Widget \"%s\" could not be found\n",
name);
return w;
}
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);
+}
+