diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2004-04-10 05:56:34 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-04-10 05:56:34 +0800 |
| commit | 2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834 (patch) | |
| tree | 744c60ae2f63132c634a7cf0a0ff7ebd1058bc1b /shell/main.c | |
| parent | 733ac62d82bab03f3cc32e042cfa56a5e3138869 (diff) | |
| download | gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.tar gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.tar.gz gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.tar.bz2 gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.tar.lz gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.tar.xz gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.tar.zst gsoc2013-evolution-2cc9ceb11f24a2cf6d127c1b6b9bd4a4f161a834.zip | |
Don't activate the components here. (e_shell_construct): Activate them all
2004-04-09 Jeffrey Stedfast <fejj@ximian.com>
* 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
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |