From 611e5407571e19353a98292d953e90e63073ba61 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 17 Oct 2004 13:39:12 +0000 Subject: R lib/ephy-module-loader.c: R lib/ephy-module-loader.h: A 2004-10-17 Christian Persch * lib/Makefile.am: R lib/ephy-module-loader.c: R lib/ephy-module-loader.h: A lib/ephy-module.c: (ephy_module_get_type), (ephy_module_load), (ephy_module_unload), (ephy_module_get_path), (ephy_module_new_object), (ephy_module_init), (ephy_module_finalize), (ephy_module_class_init), (ephy_module_new): A lib/ephy-module.h: s/EphyModuleLoader/EphyModule/g since "loader" now means something different. A lib/ephy-loader.c: (ephy_loader_get_type), (ephy_loader_type), (ephy_loader_get_object), (ephy_loader_release_object): A lib/ephy-loader.h: Generic object loader. A lib/ephy-shlib-loader.c: (ephy_shlib_loader_get_type), (free_loader_data), (ephy_shlib_loader_init), (ephy_shlib_loader_finalize), (find_library), (find_object), (idle_unref), (impl_get_object), (impl_release_object), (ephy_shlib_loader_iface_init), (ephy_shlib_loader_class_init): A lib/ephy-shlib-loader.h: A .so loader. * src/Makefile.am: * src/ephy-extensions-manager.c: (ephy_extensions_manager_load), (ephy_extensions_manager_unload), (ephy_extensions_manager_register), (ephy_extensions_manager_get_extensions), (free_extension_info), (free_loader_info), (find_extension_info), (ephy_extensions_manager_load_file), (find_loader), (get_loader_for_type), (attach_window), (load_extension), (detach_window), (unload_extension), (ephy_extensions_manager_load_dir), (active_extensions_notifier), (ephy_extensions_manager_init), (ephy_extensions_manager_finalize), (impl_attach_window), (impl_detach_window), (ephy_extensions_manager_class_init): * src/ephy-extensions-manager.h: Read extension descriptions from .xml, load them with the specified loader (for now, just only .so is supported). * src/ephy-shell.c: (ephy_shell_finalize), (ephy_shell_get_session), (ephy_shell_get_extensions_manager): Minor API change in extensions manager. * data/epiphany.schemas.in: Add extensions-manager-ui as default active extension. 2004-10-10 Marco Pesenti Gritti --- src/ephy-shell.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'src/ephy-shell.c') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index b63f49e21..1e049bb3b 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -413,18 +413,27 @@ ephy_shell_finalize (GObject *object) /* this will unload the extensions */ LOG ("Unref extension manager") - g_object_unref (shell->priv->extensions_manager); + if (shell->priv->extensions_manager) + { + g_object_unref (shell->priv->extensions_manager); + } + + LOG ("Unref session manager") + if (shell->priv->session) + { + g_object_unref (shell->priv->session); + } LOG ("Unref toolbars model") if (shell->priv->toolbars_model) { - g_object_unref (G_OBJECT (shell->priv->toolbars_model)); + g_object_unref (shell->priv->toolbars_model); } LOG ("Unref fullscreen toolbars model") if (shell->priv->fs_toolbars_model) { - g_object_unref (G_OBJECT (shell->priv->fs_toolbars_model)); + g_object_unref (shell->priv->fs_toolbars_model); } LOG ("Unref Bookmarks Editor"); @@ -605,13 +614,12 @@ ephy_shell_get_session (EphyShell *shell) { EphyExtensionsManager *manager; + shell->priv->session = g_object_new (EPHY_TYPE_SESSION, NULL); + manager = EPHY_EXTENSIONS_MANAGER (ephy_shell_get_extensions_manager (shell)); - - /* Instantiate internal extensions */ - shell->priv->session = - EPHY_SESSION (ephy_extensions_manager_add - (manager, EPHY_TYPE_SESSION)); + ephy_extensions_manager_register (manager, + G_OBJECT (shell->priv->session)); } return G_OBJECT (shell->priv->session); @@ -683,19 +691,9 @@ ephy_shell_get_extensions_manager (EphyShell *es) if (es->priv->extensions_manager == NULL) { - char *path; - /* Instantiate extensions manager */ - es->priv->extensions_manager = ephy_extensions_manager_new (); - - /* load the extensions */ - path = g_build_filename (ephy_dot_dir (), "extensions", NULL); - ephy_extensions_manager_load_dir (es->priv->extensions_manager, - path); - g_free (path); - - ephy_extensions_manager_load_dir (es->priv->extensions_manager, - EXTENSIONS_DIR); + es->priv->extensions_manager = + g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL); } return G_OBJECT (es->priv->extensions_manager); -- cgit v1.2.3