Fix possible crash if no buttons are active (should never be the case)

[pspp] / src / ui / gui / psppire-import-assistant.c

diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index a1cbfac51354f8b01628f2e585e350eda23d1979..bb29d04993cd288425dfb0215a3b83f6705e850d 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -459,15 +459,6 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page, PsppireImportAssistant *ia
       on_entering (ia, new_page);
   }
   
-#if GTK3_TRANSITION
-  if (gtk_assistant_get_page_type (assistant, page)
-      == GTK_ASSISTANT_PAGE_CONFIRM)
-    gtk_widget_grab_focus (assistant->apply);
-  else
-    gtk_widget_grab_focus (assistant->forward);
-#endif
-
-
   ia->current_page = pn;
 }
 
@@ -672,7 +663,7 @@ add_line_number_column (const PsppireImportAssistant *ia,
 
 
 static void
-set_model_on_treeview (const PsppireImportAssistant *ia, GtkWidget *tree_view, size_t first_line)
+set_model_on_treeview (PsppireImportAssistant *ia, GtkWidget *tree_view, size_t first_line)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (psppire_empty_list_store_new (ia->line_cnt - first_line));
 
@@ -2056,7 +2047,7 @@ prepare_formats_page (PsppireImportAssistant *ia)
        case SPREADSHEET_GNUMERIC:
          {
            reader = spreadsheet_make_reader (ia->spreadsheet, &sro);
-           ia->dict = ia->spreadsheet->dict;
+           ia->dict = dict_clone (ia->spreadsheet->dict);
          }
          break;
        default: