Merge commit 'origin/master' into charset

[pspp-builds.git] / src / ui / gui / helper.h

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index ca15a35c372887333d7941dc02beaccea38f9455..6bd610e7c541b2e5bd01f0a17694fa4bc8703bb4 100644 (file)
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -43,10 +43,8 @@ GObject *get_object_assert (GtkBuilder *builder, const gchar *name, GType type);
 GtkAction * get_action_assert (GtkBuilder *builder, const gchar *name);
 GtkWidget * get_widget_assert (GtkBuilder *builder, const gchar *name);
 
-/* Converts a string in the pspp locale to utf-8 */
-gchar * pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err);
-gchar * utf8_to_pspp_locale (const gchar *text, gssize len, GError **err);
-
+gchar * convert_glib_filename_to_system_filename (const gchar *fname,
+                                                 GError **err);
 
 void connect_help (GtkBuilder *);