Handle a NIL return value from `oaf_activate_from_id' without

crashing.

svn path=/trunk/; revision=6784

shell/ChangeLog

@@ -1,3 +1,9 @@
+2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* main.c (new_view_on_running_shell): Don't crash if the object
+	returned from `oaf_activate_from_id' is NIL and the exception
+	isn't set.  Just handle this as a normal error condition.
+
 2000-12-04  Michael Meeks  <michael@helixcode.com>
 
 	* e-shell-view.c (get_control_for_uri): return NULL if we can't

shell/main.c

@@ -126,7 +126,8 @@ new_view_on_running_shell (void)
 	CORBA_exception_init (&ev);
 
 	corba_object = oaf_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
+	if (ev._major != CORBA_NO_EXCEPTION
+	    || CORBA_Object_is_nil (corba_object, &ev)) {
 		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
 			  _("Cannot initialize the Evolution shell."));
 		return;