Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34209)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2007-09-26  Johnny Jacob <jjohnny@novell.com>
+
+	* main.c (open_uris): Return the status success/failure.
+	(idle_cb): if open_uris fail, open default component window.
+
 2007-09-03  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* e-shell-window-commands.c: Add contributors to the credits section.
Index: main.c
===================================================================
--- main.c	(revision 34209)
+++ main.c	(working copy)
@@ -284,11 +284,12 @@
 
 #endif /* DEVELOPMENT */
 
-static void
+static gboolean
 open_uris (GNOME_Evolution_Shell corba_shell, gchar **uris)
 {
 	CORBA_Environment ev;
 	guint n_uris, ii;
+	gboolean status = TRUE;
 
 	g_return_if_fail (uris != NULL);
 	n_uris = g_strv_length (uris);
@@ -300,10 +301,12 @@
 		if (ev._major != CORBA_NO_EXCEPTION) {
 			g_warning ("Invalid URI: %s", uris[ii]);
 			CORBA_exception_free (&ev);
+			status = FALSE;
 		}
 	}
 
 	CORBA_exception_free (&ev);
+	return status;
 }
 
 /* This is for doing stuff that requires the GTK+ loop to be running already.  */
@@ -361,9 +364,7 @@
 	}
 
 	if (shell != NULL) {
-		if (uris != NULL)
-			open_uris (corba_shell, uris);
-		else
+		if (!(uris != NULL && open_uris (corba_shell, uris))) 
 			e_shell_create_window (shell, default_component_id, NULL);
 	} else {
 		CORBA_Environment ev;
