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.

1 files changed, 16 insertions, 31 deletions

diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index 43bd1eef7..407e38b75 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -19,11 +19,12 @@
  */
 
 #include "ephy-automation.h"
-#include "ephy-shell.h"
+
 #include "EphyAutomation.h"
+#include "ephy-shell.h"
 #include "ephy-embed.h"
 #include "ephy-window.h"
-#include "session.h"
+#include "ephy-session.h"
 #include "ephy-bookmarks.h"
 #include "ephy-bookmarks-import.h"
 
@@ -31,10 +32,9 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-context.h>
 
-static void
-ephy_automation_class_init (EphyAutomationClass *klass);
+static void ephy_automation_class_init (EphyAutomationClass *klass);
 
-static GObjectClass *ephy_automation_parent_class;
+static GObjectClass *parent_class = NULL;
 
 #define EPHY_FACTORY_OAFIID "OAFIID:GNOME_Epiphany_Automation_Factory"
 
@@ -43,11 +43,7 @@ ephy_automation_factory (BonoboGenericFactory *this_factory,
 			 const char *iid,
 			 gpointer user_data)
 {
-        EphyAutomation *a;
-
-        a  = g_object_new (EPHY_TYPE_AUTOMATION, NULL);
-
-        return BONOBO_OBJECT(a);
+	return BONOBO_OBJECT (g_object_new (EPHY_TYPE_AUTOMATION, NULL));
 }
 
 BonoboGenericFactory *
@@ -60,7 +56,7 @@ ephy_automation_factory_new (void)
 					      NULL);
 	if (factory == NULL)
 	{
-		g_warning ("Could not initialize EphyAutomation factory");
+		g_warning ("Could not initialize EphyAutomation factory\n");
 	}
 
 	return factory;
@@ -78,18 +74,18 @@ impl_ephy_automation_loadurl (PortableServer_Servant _servant,
 {
 	EphyNewTabFlags flags = 0;
 	EphyWindow *window;
-	Session *session;
+	EphySession *session;
 
 	session = EPHY_SESSION (ephy_shell_get_session (ephy_shell));
 
-	if (session_autoresume (session) && *url == '\0')
+	if (ephy_session_autoresume (session) && *url == '\0')
 	{
 		/* no need to open the homepage,
 		 * we did already open session windows */
 		return;
 	}
 
-	window = ephy_shell_get_active_window (ephy_shell);
+	window = ephy_session_get_active_window (session);
 
 	if (open_in_existing_tab && window != NULL)
 	{
@@ -147,10 +143,10 @@ impl_ephy_automation_load_session (PortableServer_Servant _servant,
 				   const CORBA_char * filename,
 				   CORBA_Environment * ev)
 {
-	Session *session;
+	EphySession *session;
 
 	session = EPHY_SESSION (ephy_shell_get_session (ephy_shell));
-	session_load (session, filename);
+	ephy_session_load (session, filename);
 }
 
 static void
@@ -170,25 +166,14 @@ ephy_automation_init (EphyAutomation *c)
 }
 
 static void
-ephy_automation_object_finalize (GObject *object)
-{
-        EphyAutomation *a = EPHY_AUTOMATION (object);
-
-        ephy_automation_parent_class->finalize (G_OBJECT (a));
-}
-
-static void
 ephy_automation_class_init (EphyAutomationClass *klass)
 {
-        GObjectClass *object_class = (GObjectClass *) klass;
-        POA_GNOME_EphyAutomation__epv *epv = &klass->epv;
-
-        ephy_automation_parent_class = g_type_class_peek_parent (klass);
+	POA_GNOME_EphyAutomation__epv *epv = &klass->epv;
 
-        object_class->finalize = ephy_automation_object_finalize;
+	parent_class = g_type_class_peek_parent (klass);
 
-        /* connect implementation callbacks */
-        epv->loadurl = impl_ephy_automation_loadurl;
+	/* connect implementation callbacks */
+	epv->loadurl = impl_ephy_automation_loadurl;
 	epv->addBookmark = impl_ephy_automation_add_bookmark;
 	epv->importBookmarks = impl_ephy_automation_import_bookmarks;
 	epv->loadSession = impl_ephy_automation_load_session;