galeon/galeon-2.0.7-moz191.patch

   1 diff -ur galeon-2.0.7.umg/mozilla/EventContext.cpp galeon-2.0.7/mozilla/EventContext.cpp
   2 --- galeon-2.0.7.umg/mozilla/EventContext.cpp   2008-07-18 07:41:08.000000000 +0300
   3 +++ galeon-2.0.7/mozilla/EventContext.cpp       2009-01-06 23:17:32.000000000 +0200
   4 @@ -35,6 +35,7 @@
   5  #include <nsIDOMXULDocument.h>
   6  #include <nsIURI.h>
   7  #include <nsIDOMNSEvent.h>
   8 +#include <nsIDOMNSElement.h>
   9  #include <nsIDOMNSHTMLElement.h>
  10  #include <nsIDOMCharacterData.h>
  11  #include <nsIDOMHTMLButtonElement.h>
  12 @@ -518,20 +519,21 @@
  13  nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
  14  {
  15         /* Calculate the node coordinates relative to the widget origin */
  16 -       nsCOMPtr<nsIDOMNSHTMLElement> elem = do_QueryInterface(aTarget);
  17 +       nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget));
  18
  19         PRInt32 x = 0, y = 0;
  20 -       while (elem)
  21 +       while (nsHTMLElem)
  22         {
  23                 PRInt32 val;
  24 -               elem->GetOffsetTop(&val);       y += val;
  25 -               elem->GetScrollTop(&val);       y -= val;
  26 -               elem->GetOffsetLeft(&val);      x += val;
  27 -               elem->GetScrollLeft(&val);      x -= val;
  28 +               nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem));
  29 +               nsHTMLElem->GetOffsetTop(&val);         y += val;
  30 +               nsElem->GetScrollTop(&val);             y -= val;
  31 +               nsHTMLElem->GetOffsetLeft(&val);        x += val;
  32 +               nsElem->GetScrollLeft(&val);    x -= val;
  33
  34                 nsCOMPtr<nsIDOMElement> parent;
  35 -               elem->GetOffsetParent(getter_AddRefs(parent));
  36 -               elem = do_QueryInterface(parent);
  37 +               nsHTMLElem->GetOffsetParent (getter_AddRefs (parent));
  38 +               nsHTMLElem = do_QueryInterface(parent);
  39         }
  40         *aX = x;
  41         *aY = y;
  42 diff -ur galeon-2.0.7/mozilla/GeckoPrintSession.h galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h
  43 --- galeon-2.0.7/mozilla/GeckoPrintSession.h    2009-03-14 14:34:07.000000000 +0200
  44 +++ galeon-2.0.7.xpcomint/mozilla/GeckoPrintSession.h   2009-03-14 14:32:23.000000000 +0200
  45 @@ -22,6 +22,7 @@
  46  #define GECKO_PRINT_SESSION_H
  47
  48  #include <nsCOMPtr.h>
  49 +#include <nsXPCOMCIDInternal.h>
  50  #include <nsIPrintSession.h>
  51  #include <nsIWebProgressListener.h>
  52  #include <nsIPrintProgress.h>