From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 15 May 2013 16:55:29 +0000 (+0200)
Subject: Import Assistant: Fix broken reset buttons
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e4f9e9f04c812d39db0c247aa956af7aab8b102;p=pspp

Import Assistant: Fix broken reset buttons
---

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index a83fbb2cd5..e4f3375d25 100644
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -219,19 +219,38 @@ assist_get_page (struct assist_page *ap)
 static void
 on_reset (GtkButton *button, struct import_assistant *ia)
 {
-  gint page_num = gtk_assistant_get_current_page (ia->asst.assistant);
-  GtkWidget *page = gtk_assistant_get_nth_page (ia->asst.assistant, page_num);
-
-  if (page == assist_get_page ((struct assist_page *) ia->intro))
-    reset_intro_page (ia);
-  else if (page == assist_get_page ((struct assist_page *) ia->first_line))
-    reset_first_line_page (ia);
-  else if (page == assist_get_page ((struct assist_page *) ia->separators))
-    reset_separators_page (ia);
-  else if (page == assist_get_page ((struct assist_page *) ia->formats))
-    reset_formats_page (ia);
-  else if (page == assist_get_page ((struct assist_page *) ia->sheet_spec))
-    reset_sheet_spec_page (ia);
+  gint pn = gtk_assistant_get_current_page (ia->asst.assistant);
+  
+  if ( ia->spreadsheet) 
+    {
+      switch (pn)
+	{
+	case 0:
+	  reset_sheet_spec_page (ia);
+	 break;
+	case 1:
+	  reset_formats_page (ia);
+	  break;
+	}
+    }
+  else
+    {
+      switch (pn)
+	{
+	case 0:
+	  reset_intro_page (ia);
+	  break;
+	case 1:
+	  reset_first_line_page (ia);
+	  break;
+	case 2:
+	  reset_separators_page (ia);
+	  break;
+	case 3:
+	  reset_formats_page (ia);
+	  break;
+	}
+    }
 }
 
 /* Causes the assistant to close, returning RESPONSE for