Merge branch '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 43f6a362872b478d8b69478a4b3de277e791332f..e10d83d0c6a817d57c24bca512d15363b35f8fc0 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -65,7 +65,6 @@ static void on_cancel (GtkAssistant *assistant, struct import_assistant *);
 static void on_close (GtkAssistant *assistant, struct import_assistant *);
 static void on_paste (GtkButton *button, struct import_assistant *);
 static void on_reset (GtkButton *button, struct import_assistant *);
-static void close_assistant (struct import_assistant *, int response);
 
 /* Initializes IA's asst substructure.  PARENT_WINDOW must be the
    window to use as the assistant window's parent.  */
@@ -165,6 +164,14 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
          prepare_formats_page (ia);
        }
     }
+  else
+    {
+      if (pn == 0)
+       prepare_separators_page (ia);
+      else if (pn == 3)
+       prepare_formats_page (ia);
+    }
+
 
   if (gtk_assistant_get_page_type (assistant, page)
       == GTK_ASSISTANT_PAGE_CONFIRM)
@@ -172,22 +179,12 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
   else
     gtk_widget_grab_focus (assistant->forward);
 
-
-
-#if 0  
-  /* Prepare .... */
-  if (page == ia->separators->page)
-    prepare_separators_page (ia);
-  else if (page == ia->formats->page)
-    prepare_formats_page (ia);
-
-
+#if 0
   gtk_widget_show (ia->asst.reset_button);
   if (page == ia->formats->page)
     gtk_widget_show (ia->asst.paste_button);
   else
     gtk_widget_hide (ia->asst.paste_button);
-
 #endif
 }
 
@@ -241,7 +238,10 @@ static void
 close_assistant (struct import_assistant *ia, int response)
 {
   ia->asst.response = response;
-  g_main_loop_quit (ia->asst.main_loop);
+  /*  Use our loop_done variable until we find out
+      why      g_main_loop_quit (ia->asst.main_loop); doesn't work.
+  */
+  ia->asst.loop_done = true;
   gtk_widget_hide (GTK_WIDGET (ia->asst.assistant));
 }