projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
ui
/
gui
/
main.c
diff --git
a/src/ui/gui/main.c
b/src/ui/gui/main.c
index c57c7149889ad43b0ae3ca8e62b58bd5b4094588..24ac6c7581b550a238dc82be243a48be54553942 100644
(file)
--- a/
src/ui/gui/main.c
+++ b/
src/ui/gui/main.c
@@
-199,12
+199,14
@@
print_startup_time (gpointer data)
return FALSE;
}
return FALSE;
}
+/*
static gboolean
quit_one_loop (gpointer data)
{
gtk_main_quit ();
return FALSE;
}
static gboolean
quit_one_loop (gpointer data)
{
gtk_main_quit ();
return FALSE;
}
+*/
struct initialisation_parameters
{
struct initialisation_parameters
{
@@
-329,13
+331,14
@@
main (int argc, char *argv[])
init_p.splash_window = create_splash_window ();
init_p.data_file = optind < argc ? argv[optind] : NULL;
init_p.splash_window = create_splash_window ();
init_p.data_file = optind < argc ? argv[optind] : NULL;
- if ( show_splash )
- gtk_widget_show (init_p.splash_window);
+
//
if ( show_splash )
+
//
gtk_widget_show (init_p.splash_window);
- g_idle_add (quit_one_loop, 0);
+
//
g_idle_add (quit_one_loop, 0);
- gtk_quit_add (0, run_inner_loop, &init_p);
- gtk_main ();
+ // gtk_quit_add (0, run_inner_loop, &init_p);
+ run_inner_loop (&init_p);
+ // gtk_main ();
return 0;
}
return 0;
}