projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
compute-dialog.c
diff --git
a/src/ui/gui/compute-dialog.c
b/src/ui/gui/compute-dialog.c
index ba5871a822f8c986ce9dc0cc224ab4bdb69ec1c4..e779fba6d7f7c847144d1d6254ad57354bb705e2 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-dialog.c
@@
-22,12
+22,13
@@
#include "psppire-keypad.h"
#include "psppire-data-window.h"
#include "psppire-var-store.h"
#include "psppire-keypad.h"
#include "psppire-data-window.h"
#include "psppire-var-store.h"
+#include "psppire-selector.h"
#include "dialog-common.h"
#include "dialog-common.h"
-#include
"dict-display.h"
+#include
<libpspp/i18n.h>
#include <language/expressions/public.h>
#include <language/syntax-string-source.h>
#include <language/expressions/public.h>
#include <language/syntax-string-source.h>
-#include "
helpe
r.h"
+#include "
executo
r.h"
static void function_list_populate (GtkTreeView *tv);
static void function_list_populate (GtkTreeView *tv);
@@
-397,7
+398,7
@@
compute_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
g_object_set (dict_view,
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
g_object_set (dict_view,
- "
model
", vs->dict,
+ "
dictionary
", vs->dict,
"selection-mode", GTK_SELECTION_SINGLE,
NULL);
"selection-mode", GTK_SELECTION_SINGLE,
NULL);
@@
-603,7
+604,6
@@
insert_source_row_into_text_view (GtkTreeIter iter,
gint *idx;
struct variable *var;
GtkTreeIter dict_iter;
gint *idx;
struct variable *var;
GtkTreeIter dict_iter;
- gchar *name;
GtkTextBuffer *buffer;
g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
GtkTextBuffer *buffer;
g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
@@
-631,13
+631,10
@@
insert_source_row_into_text_view (GtkTreeIter iter,
gtk_tree_path_free (path);
gtk_tree_path_free (path);
- name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL);
-
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dest));
erase_selection (buffer);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dest));
erase_selection (buffer);
- gtk_text_buffer_insert_at_cursor (buffer,
name
, -1);
+ gtk_text_buffer_insert_at_cursor (buffer,
var_get_name (var)
, -1);
- g_free (name);
}
}