projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove "Written by Ben Pfaff <blp@gnu.org>" lines everywhere.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 1f510e24cdf90e180579502ed24b46f0de043b96..3b4181ac71e44849145a8947651811974ebc85e3 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-25,7
+25,10
@@
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
+#include <data/format.h>
#include <data/settings.h>
#include <data/settings.h>
+#include <data/file-name.h>
+#include <libpspp/getl.h>
#include <getopt.h>
#include <gtk/gtk.h>
#include <getopt.h>
#include <gtk/gtk.h>
@@
-75,6
+78,8
@@
PsppireVarStore *var_store = 0;
void create_icon_factory (void);
void create_icon_factory (void);
+static struct source_stream *the_source_stream ;
+
int
main(int argc, char *argv[])
{
int
main(int argc, char *argv[])
{
@@
-112,11
+117,13
@@
main(int argc, char *argv[])
glade_init();
glade_init();
-
-
+ fmt_init();
settings_init();
settings_init();
+ the_source_stream = create_source_stream (
+ fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+ );
- message_dialog_init
(
);
+ message_dialog_init
(the_source_stream
);
the_dictionary = psppire_dict_new();
the_dictionary = psppire_dict_new();
@@
-135,7
+142,7
@@
main(int argc, char *argv[])
if ( !xml ) return 1;
data_editor = get_widget_assert(xml, "data_editor");
if ( !xml ) return 1;
data_editor = get_widget_assert(xml, "data_editor");
- gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
+ gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
PKGDATADIR "/psppicon.png",0);
/* connect the signals in the interface */
PKGDATADIR "/psppicon.png",0);
/* connect the signals in the interface */
@@
-145,7
+152,7
@@
main(int argc, char *argv[])
data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
-
+
gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
if (filename)
gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
if (filename)
@@
-167,6
+174,7
@@
main(int argc, char *argv[])
/* start the event loop */
gtk_main();
/* start the event loop */
gtk_main();
+ destroy_source_stream (the_source_stream);
message_dialog_done();
settings_done();
message_dialog_done();
settings_done();