Merge remote branch 'origin/master' into import-gui

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

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index f1a965d5684b41fb5a3250cbf67442bb37e35e73..a83fbb2cd5add5204aa9e315c2336ee830f27fea 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.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>
@@ -46,7 +45,6 @@
 #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 "gl/error.h"
 #include "gl/intprops.h"
@@ -160,7 +158,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);