From 29381411f305c8ddc80cea606f35a225cfdbf990 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 1 Feb 2004 22:52:10 +0000 Subject: Decouple extensions manager initialisation and extensions loading. Fixes a 2004-02-01 Christian Persch * src/ephy-extensions-manager.c: (ephy_extensions_manager_init): * src/ephy-extensions-manager.h: * src/ephy-shell.c: (ephy_shell_get_extensions_manager): Decouple extensions manager initialisation and extensions loading. Fixes a crash when an extensions tried to get the session, causing us to load extensions more than once. --- src/ephy-shell.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/ephy-shell.c') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 8d65f60cb..f22da2cc0 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -710,8 +710,12 @@ ephy_shell_get_extensions_manager (EphyShell *es) if (es->priv->extensions_manager == NULL) { - /* Instantiate extensions manager; this will load the extensions */ + /* Instantiate extensions manager */ es->priv->extensions_manager = ephy_extensions_manager_new (); + + /* load the extensions */ + ephy_extensions_manager_load_dir (es->priv->extensions_manager, + EXTENSIONS_DIR); } return G_OBJECT (es->priv->extensions_manager); -- cgit v1.2.3