merge master->gtk3, fixed psppire-output-view.c refactoring; this compiles and runs...

[pspp] / src / ui / gui / main.c

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index 28f99a9ff73b6ffbf84d340c30892b6a1bb10fc7..1e59f8431fc5fa8783ca3c910180001b69e08a08 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
 {
@@ -334,13 +336,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;
 }