X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-flip.c;h=07863ec15564369467fde2e0727ec0153968de41;hb=177156c175e901a740b16632f7ada809b43638db;hp=1c823eddbed18f1edeba3ca2055eba244748aa5c;hpb=7293c1a383d325c371bd708401e5a1d7586a4d90;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-flip.c b/src/ui/gui/psppire-dialog-action-flip.c
index 1c823eddbe..07863ec155 100644
--- a/src/ui/gui/psppire-dialog-action-flip.c
+++ b/src/ui/gui/psppire-dialog-action-flip.c
@@ -48,7 +48,7 @@ generate_syntax (const PsppireDialogAction *act)
 
   text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
 
-  if ( text)
+  if (text)
     g_string_append_printf (string, " /NEWNAME = %s", text);
 
   g_string_append (string, ".\n");
@@ -70,10 +70,10 @@ dialog_state_valid (gpointer a)
 
   gint n_rows = gtk_tree_model_iter_n_children  (model, NULL);
 
-  if ( n_rows == 0 )
+  if (n_rows == 0)
     return FALSE;
 
-  if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (act->entry))))
+  if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (act->entry))))
     return FALSE;
 
   return TRUE;
@@ -89,19 +89,13 @@ refresh (PsppireDialogAction *rd_)
   gtk_entry_set_text (GTK_ENTRY (rd->entry), "");
 }
 
-static void
-psppire_dialog_action_flip_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_flip_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionFlip *act = PSPPIRE_DIALOG_ACTION_FLIP (a);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("transpose.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
+  GtkBuilder *xml = builder_new ("transpose.ui");
 
   pda->dialog = get_widget_assert   (xml, "transpose-dialog");
   pda->source = get_widget_assert   (xml, "source-treeview");
@@ -112,12 +106,13 @@ psppire_dialog_action_flip_activate (PsppireDialogAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
+  return xml;
 }
 
 static void
 psppire_dialog_action_flip_class_init (PsppireDialogActionFlipClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_flip_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_flip_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }