From 6e5d0d68dce662ca6db4a753154b010e3e82bfdc Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Mon, 10 Nov 2003 21:36:34 +0000
Subject: 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.
---
 src/ephy-window.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'src/ephy-window.c')

diff --git a/src/ephy-window.c b/src/ephy-window.c
index a32c218e7..3b81ede9e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -43,7 +43,7 @@
 #include "ephy-encoding-menu.h"
 #include "ephy-tabs-menu.h"
 #include "ephy-stock-icons.h"
-#include "session.h"
+#include "ephy-extension.h"
 #include "ephy-favicon-cache.h"
 
 #include <string.h>
@@ -348,17 +348,6 @@ ephy_window_get_type (void)
         return ephy_window_type;
 }
 
-static void
-remove_from_session (EphyWindow *window)
-{
-	Session *session;
-
-	session = EPHY_SESSION (ephy_shell_get_session (ephy_shell));
-	g_return_if_fail (session != NULL);
-
-	session_remove_window (session, GTK_WINDOW (window));
-}
-
 static void
 ephy_window_destroy (GtkObject *gtkobject)
 {
@@ -368,9 +357,13 @@ ephy_window_destroy (GtkObject *gtkobject)
 
 	if (window->priv->closing == FALSE)
 	{
+		EphyExtension *manager;
+
 		window->priv->closing = TRUE;
 
-		remove_from_session (window);
+		/* Let the extensions detach themselves from the window */
+		manager = EPHY_EXTENSION (ephy_shell_get_extensions_manager (ephy_shell));
+		ephy_extension_detach_window (manager, window);
 	}
 
 	if (window->priv->exit_fullscreen_popup)
@@ -1460,12 +1453,10 @@ ephy_window_class_init (EphyWindowClass *klass)
 static void
 ephy_window_init (EphyWindow *window)
 {
-	Session *session;
+	EphyExtension *manager;
 
 	LOG ("EphyWindow initialising %p", window)
 
-	session = EPHY_SESSION (ephy_shell_get_session (ephy_shell));
-
 	window->priv = EPHY_WINDOW_GET_PRIVATE (window);
 
 	window->priv->active_tab = NULL;
@@ -1500,8 +1491,9 @@ ephy_window_init (EphyWindow *window)
 	window->priv->enc_menu = ephy_encoding_menu_new (window);
 	window->priv->bmk_menu = ephy_bookmarks_menu_new (window);
 
-	/* Once window is fully created, add it to the session list*/
-	session_add_window (session, GTK_WINDOW (window));
+	/* Once the window is fully created let the extensions attach to it */
+	manager = EPHY_EXTENSION (ephy_shell_get_extensions_manager (ephy_shell));
+	ephy_extension_attach_window (manager, window);
 }
 
 static void
-- 
cgit v1.2.3