Made var_is_valid_name more permissive.

[pspp] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 83319c453eebb41a0bb219b565bca7bc58bd3b19..6d90cfc4ea5e7a4b6e5b2a33b6ad3210744c802c 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -152,21 +152,32 @@ get_widget_assert (GtkBuilder *builder, const gchar *name)
   return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
 }
 
-/* Converts a string in the pspp locale to utf-8.
-   The return value must be freed when no longer required*/
+/* This function must be used whenever a filename generated by glib,
+   (eg, from gtk_file_chooser_get_filename) and passed to the C library,
+   (eg through a pspp syntax string).
+*/
 gchar *
-pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
+convert_glib_filename_to_system_filename (const gchar *fname, GError **err)
 {
-  return recode_string (CONV_PSPP_TO_UTF8, text, len);
-}
+  gchar *output_name;
 
-gchar *
-utf8_to_pspp_locale (const gchar *text, gssize len, GError **err)
-{
-  return recode_string (CONV_UTF8_TO_PSPP, text, len);
+#ifdef G_OS_WIN32
+  const gchar *target_encoding;
+  gchar *utf8_name = NULL;
+
+  g_get_charset (&target_encoding);
+
+  output_name = g_convert (fname, -1, target_encoding,
+                       "UTF-8", NULL, NULL, err);
+#else
+  output_name = strdup (fname);
+#endif
+
+  return output_name;
 }
 
 
+
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid