projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
psppire-output-window.c
diff --git
a/src/ui/gui/psppire-output-window.c
b/src/ui/gui/psppire-output-window.c
index 29b849031b4e87ad5ad59a0d98a9da2f6482e282..61f3bbdd28f70c28dc4fd54a910b21e08a0cce09 100644
(file)
--- a/
src/ui/gui/psppire-output-window.c
+++ b/
src/ui/gui/psppire-output-window.c
@@
-736,6
+736,12
@@
enum {
SELECT_FMT_ODT
};
SELECT_FMT_ODT
};
+/* GNU Hurd doesn't have PATH_MAX. Use a fallback.
+ Temporary directory names are usually not that long. */
+#ifndef PATH_MAX
+# define PATH_MAX 1024
+#endif
+
static void
clipboard_get_cb (GtkClipboard *clipboard,
GtkSelectionData *selection_data,
static void
clipboard_get_cb (GtkClipboard *clipboard,
GtkSelectionData *selection_data,
@@
-949,6
+955,7
@@
psppire_output_window_init (PsppireOutputWindow *window)
GtkAction *copy_action;
GtkAction *select_all_action;
GtkTreeSelection *sel;
GtkAction *copy_action;
GtkAction *select_all_action;
GtkTreeSelection *sel;
+ GtkTreeModel *model;
string_map_init (&window->render_opts);
string_map_init (&window->render_opts);
@@
-976,12
+983,13
@@
psppire_output_window_init (PsppireOutputWindow *window)
g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), copy_action);
g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), copy_action);
- gtk_tree_view_set_model (window->overview,
- GTK_TREE_MODEL (gtk_tree_store_new (
+ model = GTK_TREE_MODEL (gtk_tree_store_new (
N_COLS,
G_TYPE_STRING, /* COL_TITLE */
G_TYPE_POINTER, /* COL_ADDR */
N_COLS,
G_TYPE_STRING, /* COL_TITLE */
G_TYPE_POINTER, /* COL_ADDR */
- G_TYPE_LONG))); /* COL_Y */
+ G_TYPE_LONG)); /* COL_Y */
+ gtk_tree_view_set_model (window->overview, model);
+ g_object_unref (model);
window->in_command = false;
window->in_command = false;