From 2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 9 Apr 2004 21:56:34 +0000 Subject: Don't activate the components here. (e_shell_construct): Activate them all 2004-04-09 Jeffrey Stedfast * e-shell.c (e_shell_attempt_upgrade): Don't activate the components here. (e_shell_construct): Activate them all here instead (before we attempt to upgrade). Fixes a bug where the shell would start up in online mode but never notify the components to go online. * main.c (idle_cb): s/Cannot access/Cannot register/ svn path=/trunk/; revision=25405 --- shell/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shell/main.c') diff --git a/shell/main.c b/shell/main.c index 1fee5219bf..4b8c535b80 100644 --- a/shell/main.c +++ b/shell/main.c @@ -389,7 +389,7 @@ idle_cb (void *data) corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) { e_notice (NULL, GTK_MESSAGE_ERROR, - _("Cannot access the Ximian Evolution shell.")); + _("Cannot register the Ximian Evolution shell.")); CORBA_exception_free (&ev); bonobo_main_quit (); return FALSE; -- cgit v1.2.3