Fixed many warnings

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

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index 9c95005e4d02820d5472653b146d19ef0bca568c..43f6a362872b478d8b69478a4b3de277e791332f 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -72,19 +72,20 @@ static void close_assistant (struct import_assistant *, int response);
 struct import_assistant *
 init_assistant (GtkWindow *parent_window)
 {
-  struct import_assistant *ia = NULL;
-  ia = xzalloc (sizeof *ia);
+  struct import_assistant *ia = xzalloc (sizeof *ia);
   struct assistant *a = &ia->asst;
 
-
-  ia->intro = xzalloc (sizeof *ia->intro);
-  ia->sheet_spec = xzalloc (sizeof *ia->sheet_spec);
-  ia->first_line = xzalloc (sizeof *ia->first_line);
-  ia->separators = xzalloc (sizeof *ia->separators);
-  ia->formats = xzalloc (sizeof *ia->formats);
-
   a->builder = builder_new ("text-data-import.ui");
   a->assistant = GTK_ASSISTANT (gtk_assistant_new ());
+
+  a->prop_renderer = gtk_cell_renderer_text_new ();
+  g_object_ref_sink (a->prop_renderer);
+  a->fixed_renderer = gtk_cell_renderer_text_new ();
+  g_object_ref_sink (a->fixed_renderer);
+  g_object_set (G_OBJECT (a->fixed_renderer),
+                "family", "Monospace",
+                (void *) NULL);
+
   g_signal_connect (a->assistant, "prepare", G_CALLBACK (on_prepare), ia);
   g_signal_connect (a->assistant, "cancel", G_CALLBACK (on_cancel), ia);
   g_signal_connect (a->assistant, "close", G_CALLBACK (on_close), ia);
@@ -99,13 +100,7 @@ init_assistant (GtkWindow *parent_window)
   gtk_window_set_transient_for (GTK_WINDOW (a->assistant), parent_window);
   gtk_window_set_icon_name (GTK_WINDOW (a->assistant), "pspp");
 
-  a->prop_renderer = gtk_cell_renderer_text_new ();
-  g_object_ref_sink (a->prop_renderer);
-  a->fixed_renderer = gtk_cell_renderer_text_new ();
-  g_object_ref_sink (a->fixed_renderer);
-  g_object_set (G_OBJECT (a->fixed_renderer),
-                "family", "Monospace",
-                (void *) NULL);
+
   return ia;
 }
 
@@ -158,12 +153,18 @@ static void
 on_prepare (GtkAssistant *assistant, GtkWidget *page,
             struct import_assistant *ia)
 {
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-
   int pn = gtk_assistant_get_current_page (assistant);
 
-  if (pn == 1 && ssp->spreadsheet)
-    post_sheet_spec_page (ia);
+  if ( ia->spreadsheet) 
+    {
+      if (pn == 0)
+       prepare_sheet_spec_page (ia);
+      else if (pn == 1)
+       {
+         post_sheet_spec_page (ia);
+         prepare_formats_page (ia);
+       }
+    }
 
   if (gtk_assistant_get_page_type (assistant, page)
       == GTK_ASSISTANT_PAGE_CONFIRM)
@@ -172,23 +173,22 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     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);
-  else if (page == ia->sheet_spec->page && ssp->spreadsheet)
-    {
-      prepare_sheet_spec_page (ia);
-    }
 
 
-  
   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
 }
 
 /* Called when the Cancel button in the assistant is clicked. */
@@ -218,6 +218,7 @@ on_paste (GtkButton *button, struct import_assistant *ia)
 static void
 on_reset (GtkButton *button, struct import_assistant *ia)
 {
+#if 0
   gint page_num = gtk_assistant_get_current_page (ia->asst.assistant);
   GtkWidget *page = gtk_assistant_get_nth_page (ia->asst.assistant, page_num);
 
@@ -231,6 +232,7 @@ on_reset (GtkButton *button, struct import_assistant *ia)
     reset_formats_page (ia);
   else if (page == ia->sheet_spec->page)
     reset_sheet_spec_page (ia);
+#endif
 }
 
 /* Causes the assistant to close, returning RESPONSE for