X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-reliability.c;h=4bb78f9e1e1a089fb0dbf09682849d195e93fc25;hb=refs%2Fheads%2Fctables7;hp=c3d035cfbdbedac621929a6825b11752fa3eeb56;hpb=fc6620099bbc53762095569d5356b67a81a85402;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c
index c3d035cfbd..4bb78f9e1e 100644
--- a/src/ui/gui/psppire-dialog-action-reliability.c
+++ b/src/ui/gui/psppire-dialog-action-reliability.c
@@ -29,14 +29,14 @@ static void psppire_dialog_action_reliability_class_init      (PsppireDialogActi
 
 G_DEFINE_TYPE (PsppireDialogActionReliability, psppire_dialog_action_reliability, PSPPIRE_TYPE_DIALOG_ACTION);
 
-enum 
+enum
   {
     ALPHA = 0,
     SPLIT = 1
   };
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionReliability *rd = PSPPIRE_DIALOG_ACTION_RELIABILITY (act);
   gchar *text;
@@ -48,14 +48,14 @@ generate_syntax (PsppireDialogAction *act)
 
   g_string_append (string, "\n\t/MODEL=");
 
-  if ( ALPHA == gtk_combo_box_get_active (GTK_COMBO_BOX (rd->model_combo)))
+  if (ALPHA == gtk_combo_box_get_active (GTK_COMBO_BOX (rd->model_combo)))
     g_string_append (string, "ALPHA");
   else
     g_string_append_printf (string, "SPLIT (%d)",
 			    gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rd->split_spinbutton))
-			    );
+			);
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->scale_if_item_deleted_checkbutton)))
     g_string_append (string, "\n\t/SUMMARY = TOTAL");
 
   g_string_append (string, ".\n");
@@ -95,7 +95,7 @@ update_split_control (PsppireDialogActionReliability *pda)
 			     0, n_vars - 1);
 
   gtk_widget_set_sensitive (pda->split_point_hbox,
-			    ( SPLIT == gtk_combo_box_get_active (GTK_COMBO_BOX (pda->model_combo))));
+			    (SPLIT == gtk_combo_box_get_active (GTK_COMBO_BOX (pda->model_combo))));
 }
 
 
@@ -119,20 +119,14 @@ refresh (PsppireDialogAction *pda_)
 				FALSE);
 }
 
-static void
-psppire_dialog_action_reliability_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_reliability_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionReliability *act = PSPPIRE_DIALOG_ACTION_RELIABILITY (a);
   GtkTreeModel *liststore ;
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("reliability.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
+  GtkBuilder *xml = builder_new ("reliability.ui");
 
   pda->dialog = get_widget_assert   (xml, "reliability-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
@@ -164,16 +158,14 @@ psppire_dialog_action_reliability_activate (GtkAction *a)
 
   psppire_dialog_action_set_refresh (pda, refresh);
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_reliability_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_reliability_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_reliability_class_init (PsppireDialogActionReliabilityClass *class)
 {
   PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_reliability_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_reliability_activate;
 
   pdac->generate_syntax = generate_syntax;
 }