New file: builder-wrapper.h and builder-wrapper.c

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

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index 02d6d96c763d3064840fe72ebcd6d590aaa4acf7..68249afdcb82d39cdd6a25738287714ba14ad4ed 100644 (file)
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  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
@@ -17,11 +17,11 @@
 #include <config.h>
 
 #include "psppire-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-data-editor.h"
-#include <language/syntax-string-source.h>
 #include "executor.h"
+#include "helper.h"
 #include "psppire-var-store.h"
 #include <ui/syntax-gen.h>
 
@@ -91,11 +91,10 @@ wrap_line (GtkTextBuffer *buffer,
 
 
 void
-comments_dialog (GObject *o, gpointer data)
+comments_dialog (PsppireDataWindow *de)
 {
   GtkTextIter iter;
   gint response ;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   struct comment_dialog cd;
 
   GtkBuilder *xml = builder_new ("psppire.ui");
@@ -165,23 +164,10 @@ comments_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&cd);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&cd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&cd);
-
-       paste_syntax_in_new_window (syntax);
-
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&cd)));
       break;
     default:
       break;
@@ -210,13 +196,7 @@ refresh (PsppireDialog *dialog, const struct comment_dialog *cd)
   gtk_text_buffer_set_text (buffer, "", 0);
 
   for ( i = 0 ; i < dict_get_document_line_cnt (cd->dict->dict); ++i )
-    {
-      struct string str;
-      ds_init_empty (&str);
-      dict_get_document_line (cd->dict->dict, i, &str);
-      add_line_to_buffer (buffer, ds_cstr (&str));
-      ds_destroy (&str);
-    }
+    add_line_to_buffer (buffer, dict_get_document_line (cd->dict->dict, i));
 }
 
 
@@ -231,11 +211,10 @@ generate_syntax (const struct comment_dialog *cd)
   GtkWidget *tv = get_widget_assert (cd->xml, "comments-textview1");
   GtkWidget *check = get_widget_assert (cd->xml, "comments-checkbutton1");
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
-  const char *existing_docs = dict_get_documents (cd->dict->dict);
 
   str = g_string_new ("\n* Data File Comments.\n\n");
 
-  if ( NULL != existing_docs)
+  if (dict_get_documents (cd->dict->dict) != NULL)
     g_string_append (str, "DROP DOCUMENTS.\n");
 
   g_string_append (str, "ADD DOCUMENT\n");