Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / psppire-dialog-action-indep-samps.c

diff --git a/src/ui/gui/psppire-dialog-action-indep-samps.c b/src/ui/gui/psppire-dialog-action-indep-samps.c
index 3d8284eac5e1ff3087a74ab6550621d01e516c2e..de0d373be97e9a0e32bb64fbb4c6dc9661ec67b1 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-indep-samps.c
+++ b/src/ui/gui/psppire-dialog-action-indep-samps.c
@@ -49,10 +49,10 @@ dialog_state_valid (gpointer data)
   if (NULL == act->grp_var)
     return FALSE;
 
-  if ( 0 == gtk_tree_model_get_iter_first (vars, &notused))
+  if (0 == gtk_tree_model_get_iter_first (vars, &notused))
     return FALSE;
 
-  if ( act->group_defn == GROUPS_UNDEF)
+  if (act->group_defn == GROUPS_UNDEF)
     return FALSE;
 
   return TRUE;
@@ -102,7 +102,7 @@ value_entry_contains_invalid (PsppireValueEntry *ve, const struct variable *var)
       const int width = var_get_width (var);
       value_init (&val, width);
 
-      if ( psppire_value_entry_get_value (ve, &val, width))
+      if (psppire_value_entry_get_value (ve, &val, width))
        {
          if (var_is_value_missing (var, &val, MV_SYSTEM))
            {
@@ -187,7 +187,7 @@ run_define_groups (PsppireDialogActionIndepSamps *act)
   psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->dg_grp_entry[1]), act->grp_var);
   psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (act->dg_cut_point_entry), act->grp_var);
 
-  if ( act->group_defn != GROUPS_CUT_POINT )
+  if (act->group_defn != GROUPS_CUT_POINT )
     {
       gtk_toggle_button_set_active
        (GTK_TOGGLE_BUTTON (act->dg_cut_point_toggle_button), TRUE);
@@ -353,9 +353,6 @@ psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a)
                    G_CALLBACK (on_grp_var_change), act);
 
   on_grp_var_change (GTK_ENTRY (act->group_var_entry), act);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_indep_samps_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_indep_samps_parent_class)->activate (pda);
 }