X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-recode-same.c;h=7b48a808a789dc318a496b7d7a93f990e712668c;hb=ff5de86ff88b3d3c8552ac0e29c94f4ce3a4f2eb;hp=f0e31c795e23809e24f04a70b0a15c210dc9da49;hpb=3dd0f6ae0d5eb73a2270a243e443c4ae03c2c16e;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-recode-same.c b/src/ui/gui/psppire-dialog-action-recode-same.c index f0e31c795e..7b48a808a7 100644 --- a/src/ui/gui/psppire-dialog-action-recode-same.c +++ b/src/ui/gui/psppire-dialog-action-recode-same.c @@ -43,7 +43,7 @@ difx_variable_treeview_is_populated (PsppireDialogActionRecode *rd) GtkTreeModel *vars = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview)); - if ( !gtk_tree_model_get_iter_first (vars, ¬_used)) + if (!gtk_tree_model_get_iter_first (vars, ¬_used)) return FALSE; return TRUE; @@ -59,11 +59,11 @@ dialog_state_valid (gpointer data) PsppireDialogActionRecode *rd = data; GtkTreeIter not_used; - if ( ! rd->value_map ) + if (! rd->value_map) return FALSE; - if ( ! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map), - ¬_used) ) + if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map), + ¬_used)) return FALSE; return difx_variable_treeview_is_populated (rd); @@ -96,13 +96,13 @@ 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")); @@ -119,6 +119,8 @@ psppire_dialog_action_recode_same_activate (PsppireDialogAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); + + return xml; } static void @@ -142,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;