X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcomments-dialog.c;h=f1a4936e6de06e9df95abcff13966f09faa8705e;hb=389b447a91e26f255e79c4fd8520d99931809ed0;hp=8e017a22d91d791eb9cf6f65614c6d4d1e671f19;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index 8e017a22..f1a4936e 100644
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -16,14 +16,13 @@
 
 #include <config.h>
 
-#include <gtksheet/gtksheet.h>
 #include "psppire-dialog.h"
 #include "helper.h"
 #include "data-editor.h"
 #include <language/syntax-string-source.h>
 #include "syntax-editor.h"
 #include "psppire-var-store.h"
-#include <libpspp/syntax-gen.h>
+#include <ui/syntax-gen.h>
 
 #include "comments-dialog.h"
 
@@ -106,10 +105,9 @@ comments_dialog (GObject *o, gpointer data)
   GtkWidget *label = get_widget_assert (xml, "column-number-label");
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+  PsppireVarStore *vs = NULL;
 
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
 
@@ -246,27 +244,27 @@ generate_syntax (const struct comment_dialog *cd)
 
   for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i )
     {
-      struct string line;
-      GtkTextIter start, end;
-      gtk_text_buffer_get_iter_at_line (buffer, &start, i);
-
-      end = start;
+      struct string tmp;
+      GtkTextIter start;
+      char *line;
 
-      gtk_text_iter_forward_to_line_end (&end);
-
-      if ( gtk_text_iter_ends_line (&start))
-	ds_init_cstr (&line, "");
+      gtk_text_buffer_get_iter_at_line (buffer, &start, i);
+      if (gtk_text_iter_ends_line (&start))
+	line = g_strdup ("");
       else
-	ds_init_cstr (&line,
-		      gtk_text_buffer_get_text (buffer,
-						&start, &end,
-						FALSE));
+        {
+          GtkTextIter end = start;
+          gtk_text_iter_forward_to_line_end (&end);
+          line = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+        }
 
-      gen_quoted_string (&line);
+      ds_init_empty (&tmp);
+      syntax_gen_string (&tmp, ss_cstr (line));
+      g_free (line);
 
-      g_string_append_printf (str, " %s\n", ds_cstr (&line));
+      g_string_append_printf (str, " %s\n", ds_cstr (&tmp));
 
-      ds_destroy (&line);
+      ds_destroy (&tmp);
     }
   g_string_append (str, " .\n");