Rewrite Import Dialog.

[pspp] / src / ui / gui / psppire-dialog-action-rank.c

diff --git a/src/ui/gui/psppire-dialog-action-rank.c b/src/ui/gui/psppire-dialog-action-rank.c
index bbf30a61ce0a47420f01bd9b11d186eaaee160ff..460044bbe1eedd5288c648b4f7608c3af3f501bb 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-rank.c
+++ b/src/ui/gui/psppire-dialog-action-rank.c
@@ -169,14 +169,12 @@ run_types_dialog (GtkButton *b, PsppireDialogActionRank *dar)
 {
   PsppireDialogAction *act  = PSPPIRE_DIALOG_ACTION (dar);
 
-  gint response;
-
   gtk_window_set_transient_for (GTK_WINDOW (dar->types_dialog),
                                GTK_WINDOW (act->dialog));
 
   types_dialog_reset (dar);
 
-  response = psppire_dialog_run (PSPPIRE_DIALOG (dar->types_dialog));
+  psppire_dialog_run (PSPPIRE_DIALOG (dar->types_dialog));
 }
 
 static void
@@ -184,12 +182,10 @@ run_ties_dialog (GtkButton *b,  PsppireDialogActionRank *dar)
 {
   PsppireDialogAction *act  = PSPPIRE_DIALOG_ACTION (dar);
 
-  gint response;
-
   gtk_window_set_transient_for (GTK_WINDOW (dar->ties_dialog),
                                GTK_WINDOW (act->dialog));
 
-  response = psppire_dialog_run (PSPPIRE_DIALOG (dar->ties_dialog));
+  psppire_dialog_run (PSPPIRE_DIALOG (dar->ties_dialog));
 }
 
 static void
@@ -216,7 +212,13 @@ psppire_dialog_action_rank_activate (GtkAction *a)
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionRank *act = PSPPIRE_DIALOG_ACTION_RANK (a);
 
-  GtkBuilder *xml = builder_new ("rank.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("rank.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   GtkWidget *types_button = get_widget_assert (xml, "button1");
   GtkWidget *ties_button = get_widget_assert (xml, "button2");
@@ -297,14 +299,12 @@ psppire_dialog_action_rank_activate (GtkAction *a)
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
 
   PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_rank_parent_class)->activate (pda);
-  
-  g_object_unref (xml);
 }
 
 static void
 psppire_dialog_action_rank_class_init (PsppireDialogActionRankClass *class)
 {
-  GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_rank_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_rank_activate);
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }