Crosstabs Dialog: Avoid populating dialog more than once

diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c
index f6883a88041924f2835bc78bb7c60ee277557311..aa5c86cc85880f87dbcb1f90f146cfda995a91e5 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-crosstabs.c
+++ b/src/ui/gui/psppire-dialog-action-crosstabs.c
@@ -214,59 +214,59 @@ psppire_dialog_action_crosstabs_activate (GtkAction *a)
     {
       xml = builder_new ("crosstabs.ui");
       g_hash_table_insert (thing, a, xml);
-    }
-
-  pda->dialog = get_widget_assert   (xml, "crosstabs-dialog");
-  pda->source = get_widget_assert   (xml, "dict-treeview");
 
-  act->dest_rows =   get_widget_assert   (xml, "rows");
-  act->dest_cols =   get_widget_assert   (xml, "cols");
-  act->format_button = get_widget_assert (xml, "format-button");
-  act->stat_button = get_widget_assert (xml, "stats-button");
-  act->cell_button = get_widget_assert (xml, "cell-button");
-  act->stat_view =   get_widget_assert (xml, "stats-view");
-  act->cell_view =   get_widget_assert (xml, "cell-view");
-  act->cell_dialog = get_widget_assert (xml, "cell-dialog");
-  act->stat_dialog = get_widget_assert (xml, "stat-dialog");
-  act->format_dialog = get_widget_assert (xml, "format-dialog");
+      pda->dialog = get_widget_assert   (xml, "crosstabs-dialog");
+      pda->source = get_widget_assert   (xml, "dict-treeview");
 
-  act->avalue_button = get_widget_assert (xml, "ascending");
-  act->table_button = get_widget_assert (xml, "print-tables");
-  act->pivot_button = get_widget_assert (xml, "pivot");
+      act->dest_rows =   get_widget_assert   (xml, "rows");
+      act->dest_cols =   get_widget_assert   (xml, "cols");
+      act->format_button = get_widget_assert (xml, "format-button");
+      act->stat_button = get_widget_assert (xml, "stats-button");
+      act->cell_button = get_widget_assert (xml, "cell-button");
+      act->stat_view =   get_widget_assert (xml, "stats-view");
+      act->cell_view =   get_widget_assert (xml, "cell-view");
+      act->cell_dialog = get_widget_assert (xml, "cell-dialog");
+      act->stat_dialog = get_widget_assert (xml, "stat-dialog");
+      act->format_dialog = get_widget_assert (xml, "format-dialog");
 
-  act->format_options_avalue = TRUE;
-  act->format_options_table = TRUE;
-  act->format_options_pivot = TRUE;
+      act->avalue_button = get_widget_assert (xml, "ascending");
+      act->table_button = get_widget_assert (xml, "print-tables");
+      act->pivot_button = get_widget_assert (xml, "pivot");
 
-  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
-                                 B_CS_CELL_DEFAULT,
-                                 N_CROSSTABS_CELLS,
-                                 cells);
+      act->format_options_avalue = TRUE;
+      act->format_options_table = TRUE;
+      act->format_options_pivot = TRUE;
 
-  act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
+      psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
+                                         B_CS_CELL_DEFAULT,
+                                         N_CROSSTABS_CELLS,
+                                         cells);
 
-  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
-                                 B_CS_STATS_DEFAULT,
-                                 N_CROSSTABS_STATS,
-                                 stats);
+      act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
 
-  act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
+      psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
+                                         B_CS_STATS_DEFAULT,
+                                         N_CROSSTABS_STATS,
+                                         stats);
 
-  psppire_dialog_action_set_refresh (pda, refresh);
+      act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
 
-  psppire_dialog_action_set_valid_predicate (pda,
-                                       dialog_state_valid);
+      psppire_dialog_action_set_refresh (pda, refresh);
 
-  g_signal_connect_swapped (act->cell_button, "clicked",
-                           G_CALLBACK (on_cell_clicked), act);
+      psppire_dialog_action_set_valid_predicate (pda,
+                                                dialog_state_valid);
 
-  g_signal_connect_swapped (act->stat_button, "clicked",
-                           G_CALLBACK (on_statistics_clicked), act);
+      g_signal_connect_swapped (act->cell_button, "clicked",
+                               G_CALLBACK (on_cell_clicked), act);
 
-  g_signal_connect_swapped (act->format_button, "clicked",
-                           G_CALLBACK (on_format_clicked), act);
+      g_signal_connect_swapped (act->stat_button, "clicked",
+                               G_CALLBACK (on_statistics_clicked), act);
 
+      g_signal_connect_swapped (act->format_button, "clicked",
+                               G_CALLBACK (on_format_clicked), act);
 
+    }
+  
   if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate)
     PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate (pda);
 }