X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fsort-cases-dialog.c;h=242b7d3c07392b8ecca08bb46cb67ad91eb26238;hb=7c2fa3735ac1115b6c1ad4b5e0613673de2faf4c;hp=b5d1bbaafa1d9803007a65ee5f9ae8ce25cb86ad;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp-builds.git diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c index b5d1bbaa..242b7d3c 100644 --- a/src/ui/gui/sort-cases-dialog.c +++ b/src/ui/gui/sort-cases-dialog.c @@ -17,7 +17,7 @@ #include #include #include "sort-cases-dialog.h" -#include "helper.h" +#include "executor.h" #include "psppire-dialog.h" #include "psppire-data-window.h" #include "psppire-var-store.h" @@ -96,7 +96,7 @@ sort_cases_dialog (GObject *o, gpointer data) struct sort_cases_dialog scd; - GtkBuilder *xml = builder_new ("psppire.ui"); + GtkBuilder *xml = builder_new ("sort.ui"); GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog"); @@ -111,13 +111,12 @@ sort_cases_dialog (GObject *o, gpointer data) gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); - g_object_set (source, "dictionary", vs->dict, NULL); + g_object_get (vs, "dictionary", &scd.dict, NULL); + g_object_set (source, "dictionary", scd.dict, NULL); - set_dest_model (GTK_TREE_VIEW (dest), vs->dict); + set_dest_model (GTK_TREE_VIEW (dest), scd.dict); psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector), - source, - dest, insert_source_row_into_tree_view, NULL, NULL); @@ -125,7 +124,6 @@ sort_cases_dialog (GObject *o, gpointer data) g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest); scd.tv = GTK_TREE_VIEW (dest); - scd.dict = vs->dict; scd.ascending = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));