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 6bd6d1b9048085e47d7b09c6a1ba6966ba6f5522..6bc9e9686c8bab95f6b772cda4219827dc0f24f4 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;
 }
 
+/*
 static gboolean
 quit_one_loop (gpointer data)
 {
   gtk_main_quit ();
   return FALSE;
 }
+*/
 
 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;
 
-  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;
 }