gui: Make syntax execution functions take a PsppireDataWindow argument.

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

diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index 0061193e16b1b86f1d9dfa6c7c26d336e04cfb6b..87e3b1e4657ea169a7130a9f176a56f96a4fb932 100644 (file)
--- 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  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 "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
-#include <language/syntax-string-source.h>
 #include "helper.h"
 
 #include "dialog-common.h"
@@ -77,10 +76,9 @@ dialog_state_valid (gpointer data)
 
 
 void
-transpose_dialog (GObject *o, gpointer data)
+transpose_dialog (PsppireDataWindow *de)
 {
   gint response ;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireDict *dict = NULL;
 
   GtkBuilder *xml = builder_new ("psppire.ui");
@@ -112,19 +110,12 @@ transpose_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (dict, xml);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (dict, xml)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
       {
        gchar *syntax = generate_syntax (dict, xml);
-        paste_syntax_in_new_window (syntax);
+        paste_syntax_to_window (syntax);
 
        g_free (syntax);
       }