X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-recode-different.c;h=9a41596d3bb3830c48a7b79e4c1c961a4adaf8fa;hb=bc30bc5e0a4d8bdfc56e43ccd1403c070a71dec8;hp=2d28146c792f348f1baf42f2c0b5bcf1cef609b8;hpb=ff50bab74c735b9e48b851080edcd1d466a83371;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-recode-different.c b/src/ui/gui/psppire-dialog-action-recode-different.c index 2d28146c79..9a41596d3b 100644 --- a/src/ui/gui/psppire-dialog-action-recode-different.c +++ b/src/ui/gui/psppire-dialog-action-recode-different.c @@ -41,7 +41,7 @@ difx_variable_treeview_is_populated (PsppireDialogActionRecode *rd) { PsppireDialogActionRecodeDifferent *rdd = PSPPIRE_DIALOG_ACTION_RECODE_DIFFERENT (rd); GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview)); - + if (g_hash_table_size (rdd->varmap) != gtk_tree_model_iter_n_children (model, NULL) ) return FALSE; @@ -57,7 +57,7 @@ dialog_state_valid (gpointer data) { PsppireDialogActionRecode *rd = data; GtkTreeIter not_used; - + if ( ! rd->value_map ) return FALSE; @@ -155,7 +155,7 @@ render_new_var_name (GtkTreeViewColumn *tree_column, struct variable *var = NULL; - gtk_tree_model_get (tree_model, iter, + gtk_tree_model_get (tree_model, iter, 0, &var, -1); @@ -243,7 +243,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data) g_return_if_fail (ok); gtk_tree_model_get (model, &iter, - 0, &var, + 0, &var, -1); nlp = g_hash_table_lookup (rdd->varmap, var); @@ -327,7 +327,7 @@ psppire_dialog_action_recode_different_activate (PsppireDialogAction *a) _("Recode into Different Variables: Old and New Values ")); gtk_widget_show (act->output_variable_box); - + g_signal_connect_swapped (act->old_and_new_dialog, "show", G_CALLBACK (on_old_new_show), act); @@ -335,9 +335,6 @@ psppire_dialog_action_recode_different_activate (PsppireDialogAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); - - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_recode_different_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_recode_different_parent_class)->activate (pda); } static void @@ -349,7 +346,7 @@ append_into_clause (const PsppireDialogActionRecode *rd, struct string *dds) GtkTreeIter iter; ds_put_cstr (dds, "\n\tINTO "); gboolean ok; - + for (ok = psppire_var_view_get_iter_first (PSPPIRE_VAR_VIEW (rd->variable_treeview), &iter); ok; ok = psppire_var_view_get_iter_next (PSPPIRE_VAR_VIEW (rd->variable_treeview), &iter)) @@ -358,7 +355,7 @@ append_into_clause (const PsppireDialogActionRecode *rd, struct string *dds) const struct variable *var = psppire_var_view_get_variable (PSPPIRE_VAR_VIEW (rd->variable_treeview), 0, &iter); nlp = g_hash_table_lookup (rdd->varmap, var); - + ds_put_cstr (dds, nlp->name); ds_put_cstr (dds, " "); }