rpms/epiphany/devel epiphany-2.24-moz191.patch,1.1,1.2

[Christopher Aillon]

Author: caillon

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7680

Modified Files:
	epiphany-2.24-moz191.patch 
Log Message:
the nsIDOMNSLocation changes for EphyBrowser.cpp have already been merged upstream.  Removing those, but the rest of the patch is intact

epiphany-2.24-moz191.patch:

Index: epiphany-2.24-moz191.patch
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany-2.24-moz191.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epiphany-2.24-moz191.patch	6 Jan 2009 19:00:12 -0000	1.1
+++ epiphany-2.24-moz191.patch	7 Feb 2009 17:16:50 -0000	1.2
@@ -1,33 +1,3 @@
-diff -up epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp.moz191 epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp
---- epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp.moz191	2008-10-20 17:10:43.000000000 -0400
-+++ epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp	2009-01-06 13:49:11.000000000 -0500
-@@ -66,7 +66,6 @@
- #include <nsIDOMWindow2.h>
- #include <nsIDOMXMLDocument.h>
- #include <nsIDOMLocation.h>
--#include <nsIDOMNSLocation.h>
- #include <nsIHistoryEntry.h>
- #include <nsIInterfaceRequestor.h>
- #include <nsIInterfaceRequestorUtils.h>
-@@ -700,9 +699,6 @@ EphyCommandEventListener::HandleEvent (n
-         if (NS_FAILED (rv))
-             return NS_OK;
- 
--        nsCOMPtr<nsIDOMNSLocation> domNSLocation (do_QueryInterface (domLocation));
--        NS_ENSURE_TRUE (domNSLocation, NS_OK);
--
-         nsString locationHref;
-         domLocation->GetHref (locationHref);
- 
-@@ -736,7 +732,7 @@ EphyCommandEventListener::HandleEvent (n
-         params->GetExceptionAdded (&exceptionAdded);
-         g_print ("exceptionAdded %d\n", exceptionAdded);
-         if (exceptionAdded)
--                return domNSLocation->Reload ();
-+                return domLocation->Reload (PR_FALSE);
- 
- 
-         return NS_OK;
 diff -up epiphany-2.24.2.1/embed/mozilla/EventContext.cpp.moz191 epiphany-2.24.2.1/embed/mozilla/EventContext.cpp
 --- epiphany-2.24.2.1/embed/mozilla/EventContext.cpp.moz191	2008-05-23 17:12:06.000000000 -0400
 +++ epiphany-2.24.2.1/embed/mozilla/EventContext.cpp	2009-01-06 13:49:11.000000000 -0500