should fix NB#65097 and NB#63178

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 8a9fa57..52ad08b 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
                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");
@@ -71,10 +71,10 @@ main (int argc, char *argv[])
                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;
        }
@@ -88,15 +88,12 @@ main (int argc, char *argv[])
        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");