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;hp=4c9a878ab50af136c9375b5c1da86f31088739d8;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
---

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index f1a965d568..cad23763de 100644
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -160,7 +160,9 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
   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);
diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
index 2647bb5c25..3947c79012 100644
--- a/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@ -95,18 +95,13 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
   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;
@@ -260,7 +255,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));
 
diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index a9cf86054e..597f65127e 100644
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -97,7 +97,6 @@ text_data_import_assistant (PsppireDataWindow *dw)
       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);