projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into sheet
[pspp]
/
src
/
ui
/
gui
/
psppire-data-window.c
diff --git
a/src/ui/gui/psppire-data-window.c
b/src/ui/gui/psppire-data-window.c
index c0f8ba5344cea4b48baeca0d9f5224bd883126fa..b4c9b09dac21251a56d6bbe2b651742e79dbed18 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-2023,9
+2023,7
@@
create_data_window (void)
return GTK_WINDOW (w);
}
return GTK_WINDOW (w);
}
-
-
-void
+GtkWindow *
open_data_window (PsppireWindow *victim, const char *file_name,
const char *encoding, gpointer hint)
{
open_data_window (PsppireWindow *victim, const char *file_name,
const char *encoding, gpointer hint)
{
@@
-2042,4
+2040,5
@@
open_data_window (PsppireWindow *victim, const char *file_name,
psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
gtk_widget_show_all (window);
psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
gtk_widget_show_all (window);
+ return GTK_WINDOW (window);
}
}