Merge master into gtk3.

[pspp] / src / ui / gui / page-file.c

diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
index 2647bb5c256006656c13d552783e8e26796d53da..10453b9f37e7dcd645b34ca90f277577b9636d6b 100644 (file)
--- a/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
 #include <gtk/gtk.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -40,7 +39,6 @@
 #include "libpspp/i18n.h"
 #include "libpspp/line-reader.h"
 #include "libpspp/message.h"
-#include "ui/gui/checkbox-treeview.h"
 #include "ui/gui/dialog-common.h"
 #include "ui/gui/executor.h"
 #include "ui/gui/helper.h"
@@ -50,11 +48,9 @@
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-empty-list-store.h"
 #include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
 #include "ui/gui/psppire-scanf.h"
 #include "ui/syntax-gen.h"
 
-#include "gl/error.h"
 #include "gl/intprops.h"
 #include "gl/xalloc.h"
 
@@ -81,40 +77,26 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
 {
   enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
   struct file *file = &ia->file;
-  struct spreadsheet_read_options opts;
 
   file->lines = NULL;
   file->file_name = choose_file (parent_window, &file->encoding);
   if (file->file_name == NULL)
     return false;
 
-  opts.sheet_name = NULL;
-  opts.cell_range = NULL;
-  opts.sheet_index = 1;
-
-  opts.read_names = true;
-  opts.asw = -1;
-
-  printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-
   if (ia->spreadsheet == NULL)
     ia->spreadsheet = gnumeric_probe (file->file_name, false);
 
-  printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-
   if (ia->spreadsheet == NULL)
     ia->spreadsheet = ods_probe (file->file_name, false);
 
-  printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-  
   if (ia->spreadsheet == NULL)
     {
     struct string input;
     struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
     if (reader == NULL)
       {
-       msg (ME, _("Could not open `%s': %s"),
-            file->file_name, strerror (errno));
+       msg_error (errno, _("Could not open `%s'"),
+            file->file_name);
        return false;
       }
 
@@ -217,7 +199,7 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   g_object_set (dialog, "local-only", FALSE, NULL);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Text files"));
+  gtk_file_filter_set_name (filter, _("Text Files"));
   gtk_file_filter_add_mime_type (filter, "text/*");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
@@ -260,7 +242,6 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
-
   gtk_file_chooser_set_extra_widget (
     GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));