* src/maemo/modest-address-book.c:

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index c943088..498fc4d 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -45,7 +45,6 @@ main (int argc, char *argv[])
         * 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;
        }
@@ -71,10 +70,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,9 +87,6 @@ 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;
@@ -103,8 +99,6 @@ cleanup:
                retval = 1;
        }
 
-       g_debug ("closing modest with retval %d", retval);
-
        return retval;
 }