From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Thu, 2 Aug 2007 16:40:07 +0000 (+0000)
Subject: * fix the checks a bit; don't try to top the window before checking it has been created
X-Git-Tag: git_migration_finished~2647
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=0f4599a851ee136d2621628af5410fef2beac1ed

* fix the checks a bit; don't try to top the window before checking it has been created

pmo-trunk-r2912
---

diff --git a/src/modest-main.c b/src/modest-main.c
index 3ed8076..8a9fa57 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -72,7 +72,13 @@ main (int argc, char *argv[])
 	}
 
 	win = modest_main_window_new ();
-
+			
+	if (!win) {
+		g_printerr ("modest: failed to create main window\n");
+		retval = 1;
+		goto cleanup;
+	}
+	
 	/* Usually, we only show the UI when we get the "top_application" D-Bus method.
 	 * This allows modest to start via D-Bus activation to provide a service, 
 	 * without showing the UI.
@@ -81,12 +87,6 @@ main (int argc, char *argv[])
 	 */
 	if (show_ui_without_top_application_method)
 		gtk_widget_show_all (GTK_WIDGET(win));
-		
-	if (!win) {
-		g_printerr ("modest: failed to create main window\n");
-		retval = 1;
-		goto cleanup;
-	}
 	
 	modest_window_mgr_register_window (modest_runtime_get_window_mgr(), 
 					   win);