New extensions API.

2003-11-10  Christian Persch  <chpe@cvs.gnome.org>

	New extensions API.

	* Makefile.am:
	* configure.in:
	* lib/Makefile.am:
	* lib/ephy-module-loader.c: (ephy_module_loader_get_type),
	(ephy_module_loader_new), (ephy_module_loader_load),
	(ephy_module_loader_unload), (ephy_module_loader_class_init),
	(ephy_module_loader_init), (ephy_module_loader_finalize),
	(ephy_module_loader_factory):
	* lib/ephy-module-loader.h:
	* plugins/.cvsignore:
	* plugins/Makefile.am:
	* plugins/sample/.cvsignore:
	* plugins/sample/Makefile.am:
	* plugins/sample/sample.c:
	* src/Makefile.am:
	* src/bookmarks/ephy-bookmarks-editor.c: (get_target_window):
	* src/bookmarks/ephy-bookmarks.c:
	* src/ephy-automation.c: (ephy_automation_factory),
	(ephy_automation_factory_new), (impl_ephy_automation_loadurl),
	(impl_ephy_automation_load_session), (ephy_automation_class_init):
	* src/ephy-extension.c: (ephy_extension_get_type),
	(ephy_extension_attach_window), (ephy_extension_detach_window):
	* src/ephy-extension.h:
	* src/ephy-extensions-manager.c:
	(ephy_extensions_manager_get_type),
	(ephy_extensions_manager_instantiate_extension),
	(ephy_extensions_manager_load), (ephy_extensions_manager_load_dir),
	(ephy_extensions_manager_add), (ephy_extensions_manager_init),
	(ephy_extensions_manager_finalize), (impl_attach_window),
	(impl_detach_window), (ephy_extensions_manager_iface_init),
	(ephy_extensions_manager_class_init),
	(ephy_extensions_manager_new):
	* src/ephy-extensions-manager.h:
	* src/ephy-history-window.c: (get_target_window):
	* src/ephy-plugin.c:
	* src/ephy-plugin.h:
	* src/ephy-session.c: (ephy_session_get_type),
	(get_session_filename), (session_delete), (net_stop_cb),
	(tab_added_cb), (tab_removed_cb), (tabs_reordered_cb),
	(impl_attach_window), (impl_detach_window), (save_yourself_cb),
	(die_cb), (gnome_session_attach), (gnome_session_detach),
	(ensure_session_directory), (ephy_session_init),
	(ephy_session_dispose), (ephy_session_finalize),
	(ephy_session_iface_init), (ephy_session_class_init),
	(offer_to_resume), (ephy_session_autoresume), (ephy_session_close),
	(write_tab), (write_window_geometry), (write_tool_window),
	(write_ephy_window), (ephy_session_save), (parse_embed),
	(ephy_session_load), (ephy_session_get_windows),
	(ephy_session_add_window), (ephy_session_remove_window),
	(ephy_session_get_active_window):
	* src/ephy-session.h:
	* src/ephy-shell.c: (ephy_shell_init), (ephy_shell_finalize),
	(ephy_shell_get_session), (ephy_shell_get_extensions_manager),
	(toolwindow_show_cb), (toolwindow_hide_cb):
	* src/ephy-shell.h:
	* src/ephy-window.c: (ephy_window_destroy), (ephy_window_init):
	* src/prefs-dialog.c: (prefs_homepage_current_button_clicked_cb):
	* src/session.c:
	* src/session.h:

	Create a new extensions API. Make session an internal extension :)
	Port callers to session API changes.

3 files changed, 257 insertions, 17 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f442d34db..a899c2335 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,6 +25,7 @@ NOINST_H_FILES = \
 	ephy-gui.h				\
 	ephy-langs.h				\
 	ephy-marshal.h				\
+	ephy-module-loader.h			\
 	ephy-node-filter.h			\
 	ephy-node-common.h			\
 	ephy-prefs.h				\
@@ -41,45 +42,32 @@ INST_H_FILES = \
 
 libephy_la_SOURCES = \
 	eel-gconf-extensions.c			\
-	eel-gconf-extensions.h			\
-	ephy-bonobo-extensions.h		\
 	ephy-bonobo-extensions.c		\
 	ephy-debug.c				\
-	ephy-debug.h				\
 	ephy-dialog.c				\
-	ephy-dialog.h				\
 	ephy-dnd.c				\
-	ephy-dnd.h				\
 	ephy-file-chooser.c			\
 	ephy-file-helpers.c			\
-	ephy-file-helpers.h			\
 	ephy-glade.c				\
-	ephy-glade.h				\
 	ephy-gui.c				\
 	ephy-gui.h				\
-	ephy-langs.h				\
 	ephy-langs.c				\
+	ephy-module-loader.c			\
 	ephy-marshal.c				\
-	ephy-marshal.h				\
 	ephy-node.c				\
 	ephy-node.h				\
 	ephy-node-filter.c			\
-	ephy-node-filter.h			\
 	ephy-node-common.h			\
 	ephy-node-db.c				\
-	ephy-node-db.h				\
 	ephy-prefs.h				\
 	ephy-state.c				\
-	ephy-state.h				\
 	ephy-string.c				\
-	ephy-string.h				\
 	ephy-stock-icons.c			\
-	ephy-stock-icons.h			\
 	ephy-thread-helpers.c			\
-	ephy-thread-helpers.h			\
 	ephy-types.h				\
-	ephy-zoom.h				\
-	ephy-zoom.c
+	ephy-zoom.c				\
+	$(INST_H_FILES)				\
+	$(NOINST_H_FILES)
 
 libephy_la_LIBADD = \
 	$(top_builddir)/lib/widgets/libephywidgets.la	\
diff --git a/lib/ephy-module-loader.c b/lib/ephy-module-loader.c
new file mode 100644
index 000000000..99c452927
--- /dev/null
+++ b/lib/ephy-module-loader.c
@@ -0,0 +1,207 @@
+/*
+ *  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);
+
+	if (!g_type_module_use (G_TYPE_MODULE (result)))
+	{
+		g_object_unref (result);
+
+		return NULL;
+	}
+
+	return result;
+}
+
+static gboolean
+ephy_module_loader_load (GTypeModule *module)
+{
+	EphyModuleLoader *loader = EPHY_MODULE_LOADER (module);
+	char *module_path;
+	register_module_fn register_module;
+
+	LOG ("ephy_module_loader_load %s", loader->path)
+
+	module_path = g_strdup (loader->path);
+	loader->library = g_module_open (module_path, 0);
+	g_free (module_path);
+
+	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;
+}
+
+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);
+}
diff --git a/lib/ephy-module-loader.h b/lib/ephy-module-loader.h
new file mode 100644
index 000000000..6b5b29a66
--- /dev/null
+++ b/lib/ephy-module-loader.h
@@ -0,0 +1,45 @@
+/*
+ *  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$
+ */
+
+#ifndef EPHY_MODULE_LOADER_H
+#define EPHY_MODULE_LOADER_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_MODULE_LOADER			(ephy_module_loader_get_type ())
+#define EPHY_MODULE_LOADER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_MODULE_LOADER, EphyModuleLoader))
+#define EPHY_MODULE_LOADER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_MODULE_LOADER, EphyModuleLoaderClass))
+#define EPHY_IS_MODULE_LOADER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_MODULE_LOADER))
+#define EPHY_IS_MODULE_LOADER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_MODULE_LOADER))
+#define EPHY_MODULE_LOADER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_MODULE_LOADER, EphyModuleLoaderClass))
+
+typedef struct _EphyModuleLoader EphyModuleLoader;
+
+GType			 ephy_module_loader_get_type	(void);
+
+EphyModuleLoader	*ephy_module_loader_new		(const char *path);
+
+GObject			*ephy_module_loader_factory	(EphyModuleLoader *loader);
+
+G_END_DECLS
+
+#endif