X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-descriptives.c;h=5d2f4b7c5cd75537bba902f5ba2949fe4c8d726c;hb=bf62643ef9f4f991acd777b26aa747adc7886d8f;hp=451091726692705a30759bd6d6eae815c347f599;hpb=4e3feede0f6b3d2e67d6e41a9ddea3738e574dc3;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-descriptives.c b/src/ui/gui/psppire-dialog-action-descriptives.c
index 4510917266..5d2f4b7c5c 100644
--- a/src/ui/gui/psppire-dialog-action-descriptives.c
+++ b/src/ui/gui/psppire-dialog-action-descriptives.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2012  Free Software Foundation
+   Copyright (C) 2015  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ static const struct checkbox_entry_item stats[] =
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionDescriptives *scd = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (act);
   gchar *text;
@@ -192,30 +192,30 @@ dialog_refresh (PsppireDialogAction *scd_)
   gtk_toggle_button_set_active (scd->save_z_scores, false);
 }
 
-static void
-psppire_dialog_action_descriptives_activate (GtkAction *a)
+
+static GtkBuilder *
+psppire_dialog_action_descriptives_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a);
 
-  GtkBuilder *xml = builder_new ("descriptives.ui");
-
-  GtkWidget *stats_treeview = get_widget_assert    (xml, "statistics");
+  GtkBuilder *xml = builder_new ( "descriptives.ui");
 
+  GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
+  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
+				      B_DS_DEFAULT,
+				      N_DESCRIPTIVE_STATS, stats);
+  act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
+  
   pda->dialog = get_widget_assert   (xml, "descriptives-dialog");
   pda->source = get_widget_assert   (xml, "all-variables");
   act->variables =   get_widget_assert   (xml, "stat-variables");
 
-  g_object_set (pda->source, "model", pda->dict,
-	"predicate", var_is_numeric, NULL);
-
-  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
-				      B_DS_DEFAULT,
-				      N_DESCRIPTIVE_STATS, stats);
+  g_object_set (pda->source,
+		"predicate", var_is_numeric, NULL);
 
   act->stat_vars = GTK_TREE_VIEW (act->variables);
-  act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
-  
+
   act->include_user_missing =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
   act->exclude_missing_listwise =
@@ -226,15 +226,13 @@ psppire_dialog_action_descriptives_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
 
-  PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda);
-
-  g_object_unref (xml);
+  return xml;
 }
 
 static void
 psppire_dialog_action_descriptives_class_init (PsppireDialogActionDescriptivesClass *class)
 {
-  GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_descriptives_activate;
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_descriptives_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }