X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire.c;h=3b4181ac71e44849145a8947651811974ebc85e3;hb=480a0746507ce73d26f528b56dc3ed80195096e0;hp=6dd41b34156e82884bc7bfbb290749f2ee54913a;hpb=2d4dd90964061defa92972156ae2a12323708519;p=pspp-builds.git diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 6dd41b34..3b4181ac 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -77,6 +78,8 @@ PsppireVarStore *var_store = 0; void create_icon_factory (void); +static struct source_stream *the_source_stream ; + int main(int argc, char *argv[]) { @@ -116,8 +119,11 @@ main(int argc, char *argv[]) fmt_init(); settings_init(); - getl_initialize (); - message_dialog_init(); + the_source_stream = create_source_stream ( + fn_getenv_default ("STAT_INCLUDE_PATH", include_path) + ); + + message_dialog_init (the_source_stream); the_dictionary = psppire_dict_new(); @@ -136,7 +142,7 @@ main(int argc, char *argv[]) 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 */ @@ -146,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)); - + gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); if (filename) @@ -168,7 +174,7 @@ main(int argc, char *argv[]) /* start the event loop */ gtk_main(); - getl_uninitialize (); + destroy_source_stream (the_source_stream); message_dialog_done(); settings_done();