From edd48d92ae634d1b32269ddb1d2b3152eb800169 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 25 Oct 2004 19:19:13 +0000 Subject: De-couple instantiation and initialisation of the extensions manager. 2004-10-25 Christian Persch * src/ephy-extensions-manager.c: (ephy_extensions_manager_init), (ephy_extensions_manager_startup): * src/ephy-extensions-manager.h: * src/ephy-shell.c: (ephy_shell_get_extensions_manager): De-couple instantiation and initialisation of the extensions manager. Fixes double-instance and weirdness and double-type-registration on startup when extensions use the session in their instance_init. --- src/ephy-extensions-manager.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/ephy-extensions-manager.c') diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c index f39283abe..6139051df 100644 --- a/src/ephy-extensions-manager.c +++ b/src/ephy-extensions-manager.c @@ -887,11 +887,19 @@ init_schema_ctxt (EphyExtensionsManager *manager) static void ephy_extensions_manager_init (EphyExtensionsManager *manager) { - char *path; - manager->priv = EPHY_EXTENSIONS_MANAGER_GET_PRIVATE (manager); LOG ("EphyExtensionsManager initialising") +} + +void +ephy_extensions_manager_startup (EphyExtensionsManager *manager) +{ + char *path; + + g_return_if_fail (EPHY_IS_EXTENSIONS_MANAGER (manager)); + + LOG ("EphyExtensionsManager startup") init_schema_ctxt (manager); -- cgit v1.2.3