X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-regression.c;h=b475ebb0dfb6a9b5be6a855ee43cefaf3ea0eef3;hb=d97c0f1ed2858c48173c023964cec8234b5bc831;hp=5a64162993231405f85a672d79df514638a93bc5;hpb=83310cb45d7d8eddd9d2016baedf42ec00fe31c7;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-regression.c b/src/ui/gui/psppire-dialog-action-regression.c
index 5a64162993..b475ebb0df 100644
--- a/src/ui/gui/psppire-dialog-action-regression.c
+++ b/src/ui/gui/psppire-dialog-action-regression.c
@@ -141,13 +141,14 @@ on_save_clicked (PsppireDialogActionRegression *rd)
 }
 
 
-static void
-psppire_dialog_action_regression_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_regression_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GtkBuilder *xml = builder_new ("regression.ui");
+  GtkBuilder *xml = builder_new ( "regression.ui");
+  
   GtkWidget *stat_button = get_widget_assert (xml, "stat-button");
   GtkWidget *save_button = get_widget_assert (xml, "save-button");
 
@@ -162,8 +163,6 @@ psppire_dialog_action_regression_activate (GtkAction *a)
   act->pred_button = get_widget_assert (xml, "pred-button");
   act->resid_button = get_widget_assert (xml, "resid-button");
 
-  g_object_unref (xml);
-
   psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
   				  B_RG_STATS_DEFAULT,
   				  N_REGRESSION_STATS,
@@ -180,15 +179,13 @@ psppire_dialog_action_regression_activate (GtkAction *a)
   g_signal_connect_swapped (save_button, "clicked",
 			    G_CALLBACK (on_save_clicked),  act);
 
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_regression_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_regression_parent_class)->activate (pda);
+  return xml;
 }
 
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionRegression *rd = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
   gchar *text = NULL;
@@ -208,17 +205,17 @@ generate_syntax (PsppireDialogAction *a)
   g_string_append (string, "\n\t/DEPENDENT=");
   psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->dep_vars), 0, string);
   g_string_append (string, "\n\t/METHOD=ENTER");
-  
+
   selected = 0;
-  for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok; 
+  for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok;
        i++, ok = gtk_tree_model_iter_next (model, &iter))
     {
       gboolean toggled;
       gtk_tree_model_get (model, &iter,
-			  CHECKBOX_COLUMN_SELECTED, &toggled, -1); 
-      if (toggled) 
-	selected |= 1u << i; 
-      else 
+			  CHECKBOX_COLUMN_SELECTED, &toggled, -1);
+      if (toggled)
+	selected |= 1u << i;
+      else
 	selected &= ~(1u << i);
     }
 
@@ -256,7 +253,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_regression_class_init (PsppireDialogActionRegressionClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_regression_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_regression_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }