X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdescriptives-dialog.c;h=c6343d5bbb7ccfc57d90bc64a6049a51594a5de5;hb=99732245d610cf363429f1b67a8b2b2e15a9a734;hp=cad48b888539988c40c0923aa903a4017665dc3c;hpb=cea13036899235f1b8b75c45b9ed825dde034ead;p=pspp diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c index cad48b8885..c6343d5bbb 100644 --- a/src/ui/gui/descriptives-dialog.c +++ b/src/ui/gui/descriptives-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 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,7 +23,6 @@ #include #include -#include #include #include #include @@ -203,10 +202,9 @@ dialog_state_valid (gpointer data) /* Pops up the Descriptives dialog box */ void -descriptives_dialog (GObject *o, gpointer data) +descriptives_dialog (PsppireDataWindow *de) { gint response; - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); struct descriptives_dialog scd; @@ -259,21 +257,10 @@ descriptives_dialog (GObject *o, gpointer data) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&scd); - - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&scd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&scd); - paste_syntax_in_new_window (syntax); - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&scd))); break; default: break;