gui: Make syntax execution functions take a PsppireDataWindow argument.

[pspp-builds.git] / src / ui / gui / frequencies-dialog.c

diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c
index cf67058761e0488f40ea1bc2636fd7c12ea9c81d..016682e432c19ee913a5e73473a2c255425b710e 100644 (file)
--- a/src/ui/gui/frequencies-dialog.c
+++ b/src/ui/gui/frequencies-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 <gtk/gtk.h>
 #include <stdlib.h>
 
-#include <language/syntax-string-source.h>
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
@@ -453,10 +452,9 @@ sensitive_if_active (GtkToggleButton *toggle, GtkWidget *w)
 
 /* Pops up the Frequencies dialog box */
 void
-frequencies_dialog (gpointer data)
+frequencies_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct frequencies_dialog fd;
 
@@ -571,21 +569,10 @@ frequencies_dialog (gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&fd);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&fd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&fd);
-       paste_syntax_in_new_window (syntax);
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&fd)));
       break;
     default:
       break;