** See bug #57367.

2004-06-24  Not Zed  <NotZed@Ximian.com>

        ** See bug #57367.

        * e-shell-window.c (e_shell_window_new): fix gconf client leak and
        clean up some logic.

        * e-shell.c (e_shell_construct): dont activate the components
        individually, component registry does that implictly.

        * e-component-registry.c (init): dont call query_components here.
        (query_components): setup a run-once guard.  before adding a
        component info to the list, make sure we can activate it.
        (component_info_new): take the interface as a construct argument
        now.
        (e_component_registry_peek_list): perform the component list query
        if we haven't already.
        (e_component_registry_peek_info): same.
        (e_component_registry_activate): just always return
        the reffed component, it isn't added unless it was already activated.

svn path=/trunk/; revision=26490

1 files changed, 1 insertions, 13 deletions

diff --git a/shell/e-shell.c b/shell/e-shell.c
index 825224f996..f1228045f0 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -644,20 +644,8 @@ e_shell_construct (EShell *shell,
 	while (gtk_events_pending ())
 		gtk_main_iteration ();	
 	
-	/* activate all the components */
+	/* activate all the components (peek list does this implictly) */
 	component = e_component_registry_peek_list (shell->priv->component_registry);
-	while (component != NULL) {
-		const EComponentInfo *info = component->data;
-		CORBA_Environment ev;
-		
-		CORBA_exception_init (&ev);
-		
-		e_component_registry_activate (shell->priv->component_registry, info->id, &ev);
-		
-		CORBA_exception_free (&ev);
-		
-		component = component->next;
-	}
 	
 	attempt_upgrade(shell);