Whitespace changes only

[pspp] / src / ui / gui / psppire-dialog-action-recode-same.c

diff --git a/src/ui/gui/psppire-dialog-action-recode-same.c b/src/ui/gui/psppire-dialog-action-recode-same.c
index 975ff8cead8f826430d0ef5deb6aaaf0f6f3abbd..af10448b1bfc5a60597129ed843219fee8089d3f 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-recode-same.c
+++ b/src/ui/gui/psppire-dialog-action-recode-same.c
@@ -58,7 +58,7 @@ dialog_state_valid (gpointer data)
 {
   PsppireDialogActionRecode *rd = data;
   GtkTreeIter not_used;
-      
+
   if ( ! rd->value_map )
     return FALSE;
 
@@ -96,17 +96,17 @@ on_old_new_show (PsppireDialogActionRecode *rd)
   gtk_widget_hide (rd->strings_box);
 }
 
-static void
-psppire_dialog_action_recode_same_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_recode_same_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogActionRecode *act = PSPPIRE_DIALOG_ACTION_RECODE (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  psppire_dialog_action_recode_pre_activate (act, NULL);
+  GtkBuilder *xml = psppire_dialog_action_recode_pre_activate (act, NULL);
 
   gtk_window_set_title (GTK_WINDOW (pda->dialog),
                        _("Recode into Same Variables"));
-  
+
   g_signal_connect_swapped (act->old_and_new_dialog, "show",
                            G_CALLBACK (on_old_new_show), act);
 
@@ -114,14 +114,13 @@ psppire_dialog_action_recode_same_activate (PsppireDialogAction *a)
                        _("Recode into Same Variables: Old and New Values"));
 
   gtk_widget_hide (act->output_variable_box);
-  
+
   psppire_dialog_action_set_refresh (pda, refresh);
 
   psppire_dialog_action_set_valid_predicate (pda,
                                        dialog_state_valid);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_recode_same_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_recode_same_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
@@ -145,7 +144,7 @@ target_is_string (const PsppireDialogActionRecode *rd)
 static void
 psppire_dialog_action_recode_same_class_init (PsppireDialogActionRecodeSameClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_recode_same_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_recode_same_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = same_generate_syntax;
   PSPPIRE_DIALOG_ACTION_RECODE_CLASS (class)->target_is_string = target_is_string;