projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-var-store: Remove.
[pspp]
/
src
/
ui
/
gui
/
comments-dialog.c
diff --git
a/src/ui/gui/comments-dialog.c
b/src/ui/gui/comments-dialog.c
index 35e7c368c678c61f90331fb1d7dd741b05008c6f..1d31777379a0e3c7b4d3dbe951b44d60d4db4350 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010, 2011 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
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 <config.h>
#include "psppire-dialog.h"
-#include "
hel
per.h"
+#include "
builder-wrap
per.h"
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include "executor.h"
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include "executor.h"
-#include "
psppire-var-store
.h"
+#include "
helper
.h"
#include <ui/syntax-gen.h>
#include "comments-dialog.h"
#include <ui/syntax-gen.h>
#include "comments-dialog.h"
@@
-103,9
+103,6
@@
comments_dialog (PsppireDataWindow *de)
GtkWidget *label = get_widget_assert (xml, "column-number-label");
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
GtkWidget *label = get_widget_assert (xml, "column-number-label");
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
- PsppireVarStore *vs = NULL;
-
- g_object_get (de->data_editor, "var-store", &vs, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
@@
-143,7
+140,7
@@
comments_dialog (PsppireDataWindow *de)
}
cd.xml = xml;
}
cd.xml = xml;
- g_object_get (
vs
, "dictionary", &cd.dict, NULL);
+ g_object_get (
de->data_editor
, "dictionary", &cd.dict, NULL);
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
@@
-163,7
+160,7
@@
comments_dialog (PsppireDataWindow *de)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- g_free (execute_syntax_string (generate_syntax (&cd)));
+ g_free (execute_syntax_string (
de,
generate_syntax (&cd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&cd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&cd)));