R lib/ephy-module-loader.c: R lib/ephy-module-loader.h: A

2004-10-17  Christian Persch  <chpe@cvs.gnome.org>

	* 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  <marco@gnome.org>

1 files changed, 0 insertions, 205 deletions

diff --git a/lib/ephy-module-loader.c b/lib/ephy-module-loader.c
deleted file mode 100644
index 2cd72fd89..000000000
--- a/lib/ephy-module-loader.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *  Copyright (C) 2003 Marco Pesenti Gritti
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *  $Id$
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ephy-module-loader.h"
-#include "ephy-file-helpers.h"
-#include "ephy-debug.h"
-
-#include <gmodule.h>
-
-typedef struct _EphyModuleLoaderClass EphyModuleLoaderClass;
-
-struct _EphyModuleLoaderClass
-{
-	GTypeModuleClass parent_class;
-};
-
-struct _EphyModuleLoader
-{
-	GTypeModule parent_instance;
-
-	GModule *library;
-
-	char *path;
-	GType type;
-};
-
-typedef GType (*register_module_fn) (GTypeModule *);
-
-static void ephy_module_loader_init		(EphyModuleLoader *action);
-static void ephy_module_loader_class_init	(EphyModuleLoaderClass *class);
-static void ephy_module_loader_finalize		(GObject *object);
-
-static GObjectClass *parent_class = NULL;
-
-GType
-ephy_module_loader_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type)
-	{
-		static const GTypeInfo type_info =
-		{
-			sizeof (EphyModuleLoaderClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ephy_module_loader_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,
-			sizeof (EphyModuleLoader),
-			0, /* n_preallocs */
-			(GInstanceInitFunc) ephy_module_loader_init,
-		};
-
-		type = g_type_register_static (G_TYPE_TYPE_MODULE,
-					       "EphyModuleLoader",
-					       &type_info, 0);
-	}
-
-	return type;
-}
-
-EphyModuleLoader *
-ephy_module_loader_new (const char *path)
-{
-	EphyModuleLoader *result;
-
-	if (path == NULL || path[0] == '\0')
-	{
-		return NULL;
-	}
-
-	result = g_object_new (EPHY_TYPE_MODULE_LOADER, NULL);
-
-	g_type_module_set_name (G_TYPE_MODULE (result), path);
-	result->path = g_strdup (path);
-
-	return result;
-}
-
-static gboolean
-ephy_module_loader_load (GTypeModule *module)
-{
-	EphyModuleLoader *loader = EPHY_MODULE_LOADER (module);
-	register_module_fn register_module;
-
-	LOG ("ephy_module_loader_load %s", loader->path)
-
-	loader->library = g_module_open (loader->path, 0);
-
-	if (!loader->library)
-	{
-		g_warning (g_module_error());
-
-		return FALSE;
-	}
-
-	/* extract symbols from the lib */
-	if (!g_module_symbol (loader->library, "register_module",
-			      (void *) &register_module))
-	{
-		g_warning (g_module_error());
-		g_module_close (loader->library);
-
-		return FALSE;
-	}
-
-	g_assert (register_module != NULL);
-
-	loader->type = register_module (module);
-
-	if (loader->type == 0)
-	{
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-ephy_module_loader_unload (GTypeModule *module)
-{
-	EphyModuleLoader *loader = EPHY_MODULE_LOADER (module);
-
-	g_module_close (loader->library);
-
-	loader->library = NULL;
-	loader->type = 0;
-}
-
-const char *
-ephy_module_loader_get_path (EphyModuleLoader *loader)
-{
-	g_return_val_if_fail (EPHY_IS_MODULE_LOADER (loader), NULL);
-
-	return loader->path;
-}
-
-static void
-ephy_module_loader_class_init (EphyModuleLoaderClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-	GTypeModuleClass *loader_class = G_TYPE_MODULE_CLASS (class);
-
-	parent_class = (GObjectClass *) g_type_class_peek_parent (class);
-
-	object_class->finalize = ephy_module_loader_finalize;
-
-	loader_class->load = ephy_module_loader_load;
-	loader_class->unload = ephy_module_loader_unload;
-}
-
-static void
-ephy_module_loader_init (EphyModuleLoader *loader)
-{
-	LOG ("EphyModuleLoader initialising")
-
-	loader->library = NULL;
-	loader->path = NULL;
-	loader->type = 0;
-}
-
-static void
-ephy_module_loader_finalize (GObject *object)
-{
-	EphyModuleLoader *loader = EPHY_MODULE_LOADER (object);
-
-	LOG ("EphyModuleLoader finalising")
-
-	g_free (loader->path);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-GObject *
-ephy_module_loader_factory (EphyModuleLoader *loader)
-{
-	if (loader->type == 0)
-	{
-		return NULL;
-	}
-
-	return g_object_new (loader->type, NULL);
-}