A embed/mozilla/EphyRedirectChannel.cpp: A

2005-10-12  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/EphyAboutModule.cpp:
	* embed/mozilla/EphyAboutModule.h:
	A embed/mozilla/EphyRedirectChannel.cpp:
	A embed/mozilla/EphyRedirectChannel.h:
	* embed/mozilla/Makefile.am:

	Implement about:recover. Build the about module on all geckos, and
	only #ifdef the about:neterror implementation for gecko 1.8.

	* src/ephy-session.c: (tab_added_cb), (impl_attach_window),
	(ephy_session_autoresume), (write_tab), (ephy_session_save),
	(parse_embed), (ephy_session_load):

	Record the page load status and page title in the session file, and
	use about:recover when the page was still loading when the browser
	crashed.

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

1 files changed, 21 insertions, 19 deletions

diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index bc7ee4709..2e392f408 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -1,6 +1,7 @@
 /*
  *  Copyright (C) 2001,2002,2003 Philip Langdale
  *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2004, 2005 Christian Persch
  *
  *  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
@@ -29,6 +30,7 @@
 #include "MozDownload.h"
 #include "EphyContentPolicy.h"
 #include "EphySidebar.h"
+#include "EphyAboutModule.h"
 
 #ifdef ENABLE_FILEPICKER
 #include "FilePicker.h"
@@ -42,10 +44,6 @@
 #include <nsISecureBrowserUI.h>
 #endif
 
-#ifdef HAVE_GECKO_1_8
-#include "EphyAboutModule.h"
-#endif
-
 #include <nsMemory.h>
 #include <nsDocShellCID.h>
 #include <nsIGenericFactory.h>
@@ -63,6 +61,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(MozGlobalHistory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyContentPolicy)
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphySidebar)
+NS_GENERIC_FACTORY_CONSTRUCTOR(EphyAboutModule)
 
 #ifdef ENABLE_FILEPICKER
 NS_GENERIC_FACTORY_CONSTRUCTOR(GFilePicker)
@@ -75,9 +74,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSKeyPairDialogs)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSSecurityWarningDialogs)
 #endif
 
-#ifdef HAVE_GECKO_1_8
-NS_GENERIC_FACTORY_CONSTRUCTOR(EphyAboutModule)
-#endif
 
 /* class information */ 
 NS_DECL_CLASSINFO(EphySidebar)
@@ -205,19 +201,25 @@ static const nsModuleComponentInfo sAppComps[] = {
 		&NS_CLASSINFO_NAME(EphySidebar),
 		nsIClassInfo::DOM_OBJECT
 	},
+	{
+		EPHY_ABOUT_EPIPHANY_CLASSNAME,
+		EPHY_ABOUT_MODULE_CID,
+		EPHY_ABOUT_EPIPHANY_CONTRACTID,
+		EphyAboutModuleConstructor
+	},
+	{
+		EPHY_ABOUT_RECOVER_CLASSNAME,
+		EPHY_ABOUT_MODULE_CID,
+		EPHY_ABOUT_RECOVER_CONTRACTID,
+		EphyAboutModuleConstructor
+	},
 #ifdef HAVE_GECKO_1_8
-{
-	EPHY_ABOUT_EPIPHANY_CLASSNAME,
-	EPHY_ABOUT_MODULE_CID,
-	EPHY_ABOUT_EPIPHANY_CONTRACTID,
-	EphyAboutModuleConstructor
-},
-{
-	EPHY_ABOUT_NETERROR_CLASSNAME,
-	EPHY_ABOUT_MODULE_CID,
-	EPHY_ABOUT_NETERROR_CONTRACTID,
-	EphyAboutModuleConstructor
-},
+	{
+		EPHY_ABOUT_NETERROR_CLASSNAME,
+		EPHY_ABOUT_MODULE_CID,
+		EPHY_ABOUT_NETERROR_CONTRACTID,
+		EphyAboutModuleConstructor
+	},
 #endif
 };