X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=8e34c214be3db729a4b5f7fb9d99eb35214e7b2c;hb=af8fe020fa47f88b896924092297fb40c7831b1e;hp=f40dbf0563ffe168600058d8d86bb2fba25ff85b;hpb=ab97e700f033db654e2f44919c73973d13b0c522;p=pspp

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index f40dbf0563..8e34c214be 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -30,7 +30,7 @@
 #define N_(msgid) msgid
 
 #include "data/any-reader.h"
-#include "data/file-name.h"
+#include "data/file-handle-def.h"
 #include "data/dataset.h"
 #include "libpspp/version.h"
 
@@ -39,7 +39,6 @@
 #include "psppire-encoding-selector.h"
 #include "psppire-syntax-window.h"
 #include "psppire-window-register.h"
-#include "psppire.h"
 
 static void psppire_window_base_init     (PsppireWindowClass *class);
 static void psppire_window_class_init    (PsppireWindowClass *class);
@@ -521,11 +520,11 @@ psppire_window_query_save (PsppireWindow *se)
 			  GTK_RESPONSE_REJECT);
 
   cancel_button = gtk_dialog_add_button  (GTK_DIALOG (dialog),
-					  GTK_STOCK_CANCEL,
+					  _("Cancel"),
 					  GTK_RESPONSE_CANCEL);
 
   gtk_dialog_add_button  (GTK_DIALOG (dialog),
-			  GTK_STOCK_SAVE,
+			  _("Save"),
 			  GTK_RESPONSE_APPLY);
 
   gtk_widget_grab_focus (cancel_button);
@@ -700,8 +699,8 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
     gtk_file_chooser_dialog_new (_("Open"),
 				 GTK_WINDOW (toplevel),
 				 GTK_FILE_CHOOSER_ACTION_OPEN,
-				 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+				 _("Cancel"), GTK_RESPONSE_CANCEL,
+				 _("Open"), GTK_RESPONSE_ACCEPT,
 				 NULL);
 
   g_object_set (dialog, "local-only", FALSE, NULL);
@@ -780,19 +779,22 @@ psppire_window_open (PsppireWindow *de)
 	gchar *name =
 	  gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
-	gchar *sysname = convert_glib_filename_to_system_filename (name, NULL);
+	const gchar **cs = NULL;
+	g_get_filename_charsets (&cs);
 
         gchar *encoding = psppire_encoding_selector_get_encoding (
           gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
 
-        int retval = any_reader_detect (sysname, NULL);
+	struct file_handle *fh = fh_create_file (NULL, name, cs[0], fh_default_properties ());
+
+        int retval = any_reader_detect (fh, NULL);
 	if (retval == 1)
           open_data_window (de, name, encoding, NULL);
 	else if (retval == 0)
 	  open_syntax_window (name, encoding);
 
         g_free (encoding);
-	g_free (sysname);
+	fh_unref (fh);
 	g_free (name);
       }
       break;