X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Frecode-dialog.c;h=e7fcc6c81f6c2ac4e6cb51df08fd756ec88e1196;hb=a9a69251edd625a50f271af5d64c157533b5fe48;hp=50d87193d2381723b34da472841a9d8100284377;hpb=b11e0493376378e2a9bfff7cd76fdb32915abfd6;p=pspp-builds.git diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c index 50d87193..e7fcc6c8 100644 --- a/src/ui/gui/recode-dialog.c +++ b/src/ui/gui/recode-dialog.c @@ -24,6 +24,8 @@ #include "recode-dialog.h" +#include "executor.h" + #include #include @@ -34,7 +36,7 @@ #include #include #include -#include + #include #include "psppire-acr.h" @@ -865,7 +867,7 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) rd.new_name_entry = get_widget_assert (builder, "dest-name-entry"); rd.new_label_entry = get_widget_assert (builder, "dest-label-entry"); - rd.dict = vs->dict; + g_object_get (vs, "dictionary", &rd.dict, NULL); rd.value_map = gtk_list_store_new (2, old_value_get_type (), @@ -886,11 +888,11 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), GTK_WINDOW (de)); - g_object_set (rd.dict_treeview, "dictionary", vs->dict, NULL); + g_object_set (rd.dict_treeview, "model", rd.dict, NULL); if ( ! rd.different ) { - set_dest_model (GTK_TREE_VIEW (rd.variable_treeview), vs->dict); + set_dest_model (GTK_TREE_VIEW (rd.variable_treeview), rd.dict); } else { @@ -914,7 +916,7 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) gtk_tree_view_column_set_cell_data_func (col, renderer, cell_var_name, - vs->dict, 0); + rd.dict, 0); gtk_tree_view_append_column (GTK_TREE_VIEW (rd.variable_treeview), col); @@ -950,8 +952,6 @@ recode_dialog (PsppireDataWindow *de, gboolean diff) psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector), - rd.dict_treeview, - rd.variable_treeview, insert_source_row_into_tree_view, NULL, NULL);