X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftranspose-dialog.c;h=742dff527bd7110fb15022ee1694f7c4bb5ce7e5;hb=09691dc4d67102153f02f9606b8710ac43d7964d;hp=c2169a53763432e1f0295a74adb627ea4940692c;hpb=0c5217288cb57d0994d4c99997f5341e2c3a6871;p=pspp diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c index c2169a5376..742dff527b 100644 --- a/src/ui/gui/transpose-dialog.c +++ b/src/ui/gui/transpose-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2010 Free Software Foundation + Copyright (C) 2007, 2010, 2011, 2012 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include "executor.h" #include "psppire-data-window.h" #include "dict-display.h" +#include "builder-wrapper.h" #include "helper.h" #include "dialog-common.h" @@ -35,10 +36,6 @@ #define N_(msgid) msgid -/* FIXME: These shouldn't be here */ -#include "psppire-var-store.h" - - static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml); static void @@ -83,15 +80,11 @@ transpose_dialog (PsppireDataWindow *de) GtkBuilder *xml = builder_new ("psppire.ui"); - PsppireVarStore *vs = NULL; - GtkWidget *dialog = get_widget_assert (xml, "transpose-dialog"); GtkWidget *source = get_widget_assert (xml, "source-treeview"); GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3"); - g_object_get (de->data_editor, "var-store", &vs, NULL); - - g_object_get (vs, "dictionary", &dict, NULL); + g_object_get (de->data_editor, "dictionary", &dict, NULL); g_object_set (source, "model", dict, NULL); psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2), @@ -110,7 +103,7 @@ transpose_dialog (PsppireDataWindow *de) switch (response) { case GTK_RESPONSE_OK: - g_free (execute_syntax_string (generate_syntax (dict, xml))); + g_free (execute_syntax_string (de, generate_syntax (dict, xml))); break; case PSPPIRE_RESPONSE_PASTE: {