* command line.: */
gboolean show_ui_without_top_application_method = FALSE;
if (argc >= 2) {
- printf ("DEBUG: %s: argv[1]=%s\n", __FUNCTION__, argv[1]);
if (strcmp (argv[1], "showui") == 0)
show_ui_without_top_application_method = TRUE;
}
g_thread_init (NULL);
gdk_threads_init ();
- gdk_threads_enter ();
+ gdk_threads_enter (); /* CHECKED */
if (!gtk_init_check(&argc, &argv)) {
g_printerr ("modest: failed to initialize gtk\n");
goto cleanup;
}
- win = modest_main_window_new ();
-
+ /* this will create & register the window */
+ win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr());
if (!win) {
- g_printerr ("modest: failed to create main window\n");
+ g_printerr ("modest: failed to get main window instance\n");
retval = 1;
goto cleanup;
}
if (show_ui_without_top_application_method)
gtk_widget_show_all (GTK_WIDGET(win));
- modest_window_mgr_register_window (modest_runtime_get_window_mgr(),
- win);
- g_object_unref (win);
gtk_main ();
retval = 0;
cleanup:
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED */
if (!modest_init_uninit ()) {
g_printerr ("modest: modest_init_uninit failed\n");
retval = 1;
}
- g_debug ("closing modest with retval %d", retval);
-
return retval;
}