From 173ec4ea294cf4625218fb3f8e2471a543004aba Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 9 Apr 2004 19:01:21 +0000 Subject: make sure the component is activated before calling upgradeFromVersion. 2004-04-09 Chris Toshok * e-shell.c (e_shell_attempt_upgrade): make sure the component is activated before calling upgradeFromVersion. svn path=/trunk/; revision=25400 --- shell/ChangeLog | 5 +++++ shell/e-shell.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index df632ac2be..66330ecf82 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2004-04-09 Chris Toshok + + * e-shell.c (e_shell_attempt_upgrade): make sure the component is + activated before calling upgradeFromVersion. + 2004-04-09 Chris Toshok * e-shell.c (e_shell_attempt_upgrade): use BASE_VERSION to supply diff --git a/shell/e-shell.c b/shell/e-shell.c index c91152b62b..e4d60f32ae 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -687,7 +687,10 @@ e_shell_attempt_upgrade (EShell *shell, int major, int minor, int revision) CORBA_exception_init (&ev); - component_upgraded = GNOME_Evolution_Component_upgradeFromVersion (info->iface, major, minor, revision, &ev); + e_component_registry_activate (shell->priv->component_registry, info->id, &ev); + + if (!BONOBO_EX (&ev)) + component_upgraded = GNOME_Evolution_Component_upgradeFromVersion (info->iface, major, minor, revision, &ev); if (BONOBO_EX (&ev)) { char *exception_text; -- cgit