X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-k-related.c;h=e8760fc4ba0fb555e37943e40a2efe5bef0f18f4;hb=57f24fe728f73ba7021f658e4888dd0412b040ba;hp=387dbd30487dba35e85e99274bd6545572c6a83a;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-k-related.c b/src/ui/gui/psppire-dialog-action-k-related.c index 387dbd3048..e8760fc4ba 100644 --- a/src/ui/gui/psppire-dialog-action-k-related.c +++ b/src/ui/gui/psppire-dialog-action-k-related.c @@ -30,7 +30,7 @@ static void psppire_dialog_action_k_related_class_init (PsppireDialogAction G_DEFINE_TYPE (PsppireDialogActionKRelated, psppire_dialog_action_k_related, PSPPIRE_TYPE_DIALOG_ACTION); static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionKRelated *krd = PSPPIRE_DIALOG_ACTION_K_RELATED (act); gchar *text; @@ -105,12 +105,19 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_k_related_activate (GtkAction *a) +psppire_dialog_action_k_related_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a); - GtkBuilder *xml = builder_new ("k-related.ui"); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("k-related.ui"); + g_hash_table_insert (thing, a, xml); + } + pda->dialog = get_widget_assert (xml, "k-related-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -126,10 +133,6 @@ psppire_dialog_action_k_related_activate (GtkAction *a) "predicate", var_is_numeric, NULL); - g_object_unref (xml); - - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda); } static void