X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-reliability.c;h=9082025f7d43e0d2a170ae287180fde260f664cc;hb=0f447caa885d8f0fd8c30d4440556d9b6abb99ea;hp=b7df2049d9ee8eb4199f385ef0fb9a0cb1ed6fd6;hpb=0bda70f475aad77db5636ae0bca170513353c988;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c index b7df2049d9..9082025f7d 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; @@ -119,20 +119,14 @@ refresh (PsppireDialogAction *pda_) FALSE); } -static void -psppire_dialog_action_reliability_activate (PsppireDialogAction *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_hash_table (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 (PsppireDialogAction *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; }