X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-assistant.c;h=e287516f2ae22ceb9dbef2456a6758f9158e582a;hb=3e98eec9f2c774a7c695944c15de651ecd120430;hp=e4f3375d2534b663eb15064d69023e9adff17339;hpb=a7005f8bc73cb857489acd07b8a792d6cf2ecff7;p=pspp

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index e4f3375d25..e287516f2a 100644
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -35,7 +35,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"
@@ -46,7 +45,6 @@
 #include "ui/gui/psppire-empty-list-store.h"
 #include "ui/gui/psppire-var-sheet.h"
 
-#include "gl/error.h"
 #include "gl/intprops.h"
 #include "gl/xalloc.h"
 
@@ -169,10 +167,23 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     }
   else
     {
-      if (pn == 0)
-	prepare_separators_page (ia);
-      else if (pn == 3)
-	prepare_formats_page (ia);
+      switch (pn)
+	{
+	case 0:
+	  reset_intro_page (ia);
+	  break;
+	case 1:
+	  reset_first_line_page (ia);
+	  break;
+	case 2:
+	  prepare_separators_page (ia);
+	  reset_separators_page (ia);
+	  break;
+	case 3:
+	  prepare_formats_page (ia);
+	  reset_formats_page (ia);
+	  break;
+	}
     }
 
 
@@ -206,15 +217,6 @@ on_paste (GtkButton *button, struct import_assistant *ia)
   close_assistant (ia, PSPPIRE_RESPONSE_PASTE);
 }
 
-static GtkWidget *
-assist_get_page (struct assist_page *ap)
-{
-  if (ap == NULL)
-    return NULL;
-
-  return ap->page;
-}
-
 /* Called when the Reset button is clicked. */
 static void
 on_reset (GtkButton *button, struct import_assistant *ia)