X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fk-related-dialog.c;h=171894527cc626c0ae541736d28117b869d2a6db;hb=f758c0c7097e197d7b6fb9bb3c3d9d6e9138e0a7;hp=fb0a785d8c492a1a80b78a7e3423cb724bbd0cd9;hpb=25f47bf48c0aca4c3b75487ffa749637c792de92;p=pspp diff --git a/src/ui/gui/k-related-dialog.c b/src/ui/gui/k-related-dialog.c index fb0a785d8c..171894527c 100644 --- a/src/ui/gui/k-related-dialog.c +++ b/src/ui/gui/k-related-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2010 Free Software Foundation + Copyright (C) 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 @@ -18,16 +18,14 @@ #include "k-related-dialog.h" -#include - #include "psppire-dialog.h" #include "psppire-var-view.h" #include "psppire-acr.h" #include "dialog-common.h" -#include "helper.h" +#include "builder-wrapper.h" #include "executor.h" - +#include "helper.h" #include @@ -98,7 +96,7 @@ generate_syntax (const struct k_related_dialog *krd) if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))) { - g_string_append (string, "\n\t/KENDAL = "); + g_string_append (string, "\n\t/KENDALL = "); psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string); } @@ -162,21 +160,10 @@ k_related_dialog (PsppireDataWindow *dw) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&krd); - - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (dw, generate_syntax (&krd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&krd); - paste_syntax_to_window (syntax); - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&krd))); break; default: break;