aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ephy-extensions-manager.c4
-rw-r--r--src/ephy-extensions-manager.h3
-rw-r--r--src/ephy-shell.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index d7d44d521..9dc4d6842 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -130,7 +130,7 @@ ephy_extensions_manager_load (EphyExtensionsManager *manager,
return extension;
}
-static void
+void
ephy_extensions_manager_load_dir (EphyExtensionsManager *manager,
const char *path)
{
@@ -187,8 +187,6 @@ ephy_extensions_manager_init (EphyExtensionsManager *manager)
manager->priv->loaders = NULL;
manager->priv->extensions = NULL;
-
- ephy_extensions_manager_load_dir (manager, EXTENSIONS_DIR);
}
static void
diff --git a/src/ephy-extensions-manager.h b/src/ephy-extensions-manager.h
index 481b13ccf..22e956a0b 100644
--- a/src/ephy-extensions-manager.h
+++ b/src/ephy-extensions-manager.h
@@ -60,6 +60,9 @@ EphyExtensionsManager *ephy_extensions_manager_new (void);
EphyExtension *ephy_extensions_manager_load (EphyExtensionsManager *manager,
const char *filename);
+void ephy_extensions_manager_load_dir (EphyExtensionsManager *manager,
+ const char *path);
+
EphyExtension *ephy_extensions_manager_add (EphyExtensionsManager *manager,
GType type);
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);