X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action.c;h=1a19ebb9a57ad3fce50e073b3a56d57f5618afa5;hb=e339b2ca72d77a076566856e9357781d49cd983c;hp=e2b15e03eba76085b90d9c5756ba8f6a493bf6b4;hpb=7466f9c7baaf5a5d4cc7b670be290395ccb20b65;p=pspp diff --git a/src/ui/gui/psppire-dialog-action.c b/src/ui/gui/psppire-dialog-action.c index e2b15e03eb..1a19ebb9a5 100644 --- a/src/ui/gui/psppire-dialog-action.c +++ b/src/ui/gui/psppire-dialog-action.c @@ -88,7 +88,6 @@ psppire_dialog_action_activate (PsppireDialogAction *act) { gint response; - PsppireVarStore *vs; PsppireDialogActionClass *class = PSPPIRE_DIALOG_ACTION_GET_CLASS (act); GSList *sl = gtk_ui_manager_get_toplevels (act->uim, GTK_UI_MANAGER_MENUBAR | GTK_UI_MANAGER_TOOLBAR); @@ -97,9 +96,7 @@ psppire_dialog_action_activate (PsppireDialogAction *act) act->toplevel = gtk_widget_get_toplevel (GTK_WIDGET (sl->data)); g_slist_free (sl); - vs = PSPPIRE_DATA_WINDOW(act->toplevel)->var_store; - - g_object_get (vs, "dictionary", &act->dict, NULL); + act->dict = PSPPIRE_DATA_WINDOW(act->toplevel)->dict; g_object_set (act->source, "model", act->dict, NULL); @@ -126,6 +123,8 @@ psppire_dialog_action_activate (PsppireDialogAction *act) break; } } + + gtk_widget_destroy (act->dialog); } static void @@ -138,7 +137,7 @@ psppire_dialog_action_class_init (PsppireDialogActionClass *class) "Manager", "The GtkUIManager which created this object", GTK_TYPE_UI_MANAGER, - G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE); + G_PARAM_READWRITE); GParamSpec *toplevel_spec = g_param_spec_object ("top-level",