Merge branch 'master' into import-gui

Conflicts:
	src/ui/gui/automake.mk
	src/ui/gui/page-assistant.c
	src/ui/gui/page-file.c
	src/ui/gui/text-data-import-dialog.c

diff --cc src/ui/gui/page-assistant.c
index f1a965d5684b41fb5a3250cbf67442bb37e35e73,88314734e2d82845a82d965b3c859d3657d8d3b0..cad23763de75dcbb99834074ee6d4e40d9e26374
--- 1/src/ui/gui/page-assistant.c
--- 2/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@@ -160,10 -160,10 +160,12 @@@ on_prepare (GtkAssistant *assistant, Gt
    if ( ia->spreadsheet) 
      {
        if (pn == 0)
-       prepare_sheet_spec_page (ia);
 -      {
 -      }
++      {
++        prepare_sheet_spec_page (ia);
++        }
        else if (pn == 1)
        {
 +        post_sheet_spec_page (ia);
          prepare_formats_page (ia);
        }
      }

diff --cc src/ui/gui/page-file.c
index 2647bb5c256006656c13d552783e8e26796d53da,a65b2105382ca0894aa498abb23485968aaac6d1..3947c7901233f558ef52ab1bd4940e28a9fa4c29
--- 1/src/ui/gui/page-file.c
--- 2/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@@ -244,23 -239,7 +239,22 @@@ choose_file (GtkWindow *parent_window, 
    gtk_file_filter_add_mime_type (filter, "text/tab-separated-values");
    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
  
 +  filter = gtk_file_filter_new ();
 +  gtk_file_filter_set_name (filter, _("Gnumeric Spreadsheet Files"));
 +  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
 +  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 +
 +  filter = gtk_file_filter_new ();
 +  gtk_file_filter_set_name (filter, _("OpenDocument Spreadsheet Files"));
 +  gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
 +  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 +
 +  filter = gtk_file_filter_new ();
 +  gtk_file_filter_set_name (filter, _("All Spreadsheet Files"));
 +  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
 +  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));
  

diff --cc src/ui/gui/text-data-import-dialog.c
index a9cf86054e907f7675f19ae2c1b93cd28c883963,d535734d08d78af2085f6ec1e556bac5d2791eb0..597f65127ebdf35fcfff11ab7794573e5e6d438f
--- 1/src/ui/gui/text-data-import-dialog.c
--- 2/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@@ -97,8 -89,6 +97,7 @@@ text_data_import_assistant (PsppireData
        ia->intro = intro_page_create (ia);
        ia->separators = separators_page_create (ia);
        ia->first_line = first_line_page_create (ia);
- 
 +      printf ("%s:%d %p\n", __FILE__, __LINE__, ia->intro);
      }
    ia->formats = formats_page_create (ia);