From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 22 Mar 2013 19:01:04 +0000 (+0100)
Subject: Merge branch 'master' into import-gui
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57f8e63788b658d9b3d3377d5e28adedec06cc43;p=pspp

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
---

57f8e63788b658d9b3d3377d5e28adedec06cc43
diff --cc src/ui/gui/page-assistant.c
index f1a965d568,88314734e2..cad23763de
--- a/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 2647bb5c25,a65b210538..3947c79012
--- a/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 a9cf86054e,d535734d08..597f65127e
--- a/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);