[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 81584a5cb167e77b1c7b2b1e10f809d85a72215d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 19:47:56 2010 +0000

    2010-03-10  Garret Kelly  <gdk at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Fixing build warning caused by using 0 instead of NULL as the sentiel
            in a varargs call.
            https://bugs.webkit.org/show_bug.cgi?id=35898
    
            * src/gtk/WebInputEventFactory.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ee37e7d..7c5edaa 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-10  Garret Kelly  <gdk at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Fixing build warning caused by using 0 instead of NULL as the sentiel
+        in a varargs call.
+        https://bugs.webkit.org/show_bug.cgi?id=35898
+
+        * src/gtk/WebInputEventFactory.cpp:
+
 2010-03-10  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/gtk/WebInputEventFactory.cpp b/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
index 7125a16..f4db5ee 100644
--- a/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
+++ b/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
@@ -49,7 +49,7 @@ gint getDoubleClickTime()
 {
     static GtkSettings* settings = gtk_settings_get_default();
     gint doubleClickTime = 250;
-    g_object_get(G_OBJECT(settings), "gtk-double-click-time", &doubleClickTime, 0);
+    g_object_get(G_OBJECT(settings), "gtk-double-click-time", &doubleClickTime, NULL);
     return doubleClickTime;
 }
 

-- 
WebKit Debian packaging