[epiphany/peas: 5/6] ephy-shell: update for new extensions manager

[Diego Escalante Urrelo <diegoe src gnome org>]

commit f07eced37448f2ad35218439b586be3804c968b3
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Sat Apr 2 12:56:39 2011 -0500

    ephy-shell: update for new extensions manager

 src/ephy-shell.c |   21 ++-------------------
 1 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 4759d32..914bb27 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -524,14 +524,7 @@ ephy_shell_get_session (EphyShell *shell)
 
 	if (shell->priv->session == NULL)
 	{
-		EphyExtensionsManager *manager;
-
 		shell->priv->session = g_object_new (EPHY_TYPE_SESSION, NULL);
-
-		manager = EPHY_EXTENSIONS_MANAGER
-			(ephy_shell_get_extensions_manager (shell));
-		ephy_extensions_manager_register (manager,
-						  G_OBJECT (shell->priv->session));
 	}
 
 	return G_OBJECT (shell->priv->session);
@@ -543,7 +536,7 @@ ephy_shell_get_session (EphyShell *shell)
  *
  * Returns the lockdown controller.
  *
- * Return value: the lockdown controller
+ * Return value: (transfer none): the lockdown controller
  **/
 GObject *
 ephy_shell_get_lockdown (EphyShell *shell)
@@ -552,17 +545,10 @@ ephy_shell_get_lockdown (EphyShell *shell)
 
 	if (shell->priv->lockdown == NULL)
 	{
-		EphyExtensionsManager *manager;
-
 		shell->priv->lockdown = g_object_new (EPHY_TYPE_LOCKDOWN, NULL);
-
-		manager = EPHY_EXTENSIONS_MANAGER
-			(ephy_shell_get_extensions_manager (shell));
-		ephy_extensions_manager_register (manager,
-						  G_OBJECT (shell->priv->lockdown));
 	}
 
-	return G_OBJECT (shell->priv->session);
+	return G_OBJECT (shell->priv->lockdown);
 }
 
 /**
@@ -648,10 +634,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
 		es->priv->extensions_manager =
 			g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL);
 
-		ephy_extensions_manager_startup (es->priv->extensions_manager);
-
 		/* FIXME */
-		ephy_shell_get_lockdown (es);
 		ephy_embed_shell_get_adblock_manager (embed_shell);
 	}