Move check for javascript after the http[s] checks.

2004-06-23  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/GlobalHistory.cpp:

	Move check for javascript after the http[s] checks.

2 files changed, 11 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d12c625e9..e8b805d55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-23  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/GlobalHistory.cpp:
+
+	Move check for javascript after the http[s] checks.
+
 2004-06-21  Christian Persch  <chpe@cvs.gnome.org>
 
 	* lib/egg/egg-toolbars-model.c: (parse_item_list):
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 8558dd05e..c6632dbc4 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -53,11 +53,7 @@ NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aT
 	nsresult rv;
 	NS_ENSURE_ARG (aURI);
 
-	PRBool isJavascript;
-	rv = aURI->SchemeIs("javascript", &isJavascript);
-	NS_ENSURE_SUCCESS(rv, rv);
-
-	if (isJavascript || aRedirect || !aToplevel)
+	if (aRedirect || !aToplevel)
 	{
 		return NS_OK;
 	}
@@ -78,15 +74,16 @@ NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aT
 
 	if (!isHTTP && !isHTTPS)
 	{
-		PRBool isAbout, isViewSource, isChrome, isData;
+		PRBool isJavascript, isAbout, isViewSource, isChrome, isData;
 
-		rv = aURI->SchemeIs("about", &isAbout);
+		rv = aURI->SchemeIs("javascript", &isJavascript);
+		rv |= aURI->SchemeIs("about", &isAbout);
 		rv |= aURI->SchemeIs("view-source", &isViewSource);
 		rv |= aURI->SchemeIs("chrome", &isChrome);
 		rv |= aURI->SchemeIs("data", &isData);
 		NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
 
-		if (isAbout || isViewSource || isChrome || isData)
+		if (isJavascript || isAbout || isViewSource || isChrome || isData)
 		{
 		      return NS_OK;
 		}