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

[Christopher Aillon]

Author: caillon

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

Modified Files:
	epiphany-2.24-moz191.patch 
Log Message:
the change to EventContext.cpp was also committed upstream, this just leaves the desktop-file/plugin.cpp change for npfunctions.h

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epiphany-2.24-moz191.patch	7 Feb 2009 17:16:50 -0000	1.2
+++ epiphany-2.24-moz191.patch	7 Feb 2009 17:38:06 -0000	1.3
@@ -1,44 +1,3 @@
-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
-@@ -67,6 +67,7 @@
- 
- #ifdef ALLOW_PRIVATE_API
- #include <nsIDOMNSEvent.h>
-+#include <nsIDOMNSElement.h>
- #include <nsIDOMNSHTMLElement.h>
- #include <nsIDOMViewCSS.h>
- #include <nsIDOMViewCSS.h>
-@@ -666,20 +667,21 @@ nsresult EventContext::GetCSSBackground 
- nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
- {
- 	/* Calculate the node coordinates relative to the widget origin */
--	nsCOMPtr<nsIDOMNSHTMLElement> elem (do_QueryInterface(aTarget));
-+	nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget));
- 
- 	PRInt32 x = 0, y = 0;
--	while (elem)
-+	while (nsHTMLElem)
- 	{
- 		PRInt32 val;
--		elem->GetOffsetTop(&val);	y += val;
--		elem->GetScrollTop(&val);	y -= val;
--		elem->GetOffsetLeft(&val);	x += val;
--		elem->GetScrollLeft(&val);	x -= val;
-+		nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem));
-+		nsHTMLElem->GetOffsetTop(&val);		y += val;
-+		nsElem->GetScrollTop(&val);		y -= val;
-+		nsHTMLElem->GetOffsetLeft(&val);	x += val;
-+		nsElem->GetScrollLeft(&val);	x -= val;
- 
- 		nsCOMPtr<nsIDOMElement> parent;
--		elem->GetOffsetParent (getter_AddRefs (parent));
--		elem = do_QueryInterface(parent);
-+		nsHTMLElem->GetOffsetParent (getter_AddRefs (parent));
-+		nsHTMLElem = do_QueryInterface(parent);
- 	}
- 
- 	*aX = x;
 diff -up epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp.moz191 epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp
 --- epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp.moz191	2008-08-03 08:23:09.000000000 -0400
 +++ epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp	2009-01-06 13:51:23.000000000 -0500