[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[christian at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 031ccb5fe17af445dd75304a540c2b1c9dd432dd
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 13 11:32:15 2009 +0000

    2009-12-13  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Holger Freyther.
    
            http://bugs.webkit.org/show_bug.cgi?id=31014
            [Gtk] Build fails with gtk+-2.10 (no tested with older releases)
    
            Guard GTK+ 2.12 specific tooltip code with #ifdef.
    
            * WebCoreSupport/ChromeClientGtk.cpp:
            (WebKit::ChromeClient::mouseDidMoveOverElement):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 09fbd1c..b4c4d65 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-13  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Holger Freyther.
+
+        http://bugs.webkit.org/show_bug.cgi?id=31014
+        [Gtk] Build fails with gtk+-2.10 (no tested with older releases)
+
+        Guard GTK+ 2.12 specific tooltip code with #ifdef.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::mouseDidMoveOverElement):
+
 2009-12-11  Christian Dywan  <christian at twotoasts.de>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index d9a043b..0f46b92 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -442,6 +442,7 @@ void ChromeClient::scrollbarsModeDidChange() const
 
 void ChromeClient::mouseDidMoveOverElement(const HitTestResult& hit, unsigned modifierFlags)
 {
+#if GTK_CHECK_VERSION(2,12,0)
     // If a tooltip must be displayed it will be, afterwards, when
     // setToolTip is called; this is just a work-around to make sure
     // it updates its location correctly; see
@@ -455,6 +456,7 @@ void ChromeClient::mouseDidMoveOverElement(const HitTestResult& hit, unsigned mo
     else
         gdkDisplay = gdk_display_get_default();
     gtk_tooltip_trigger_tooltip_query(gdkDisplay);
+#endif
 
     // check if the element is a link...
     bool isLink = hit.isLiveLink();

-- 
WebKit Debian packaging