[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 4959a5405a06c16d9a6d4453073cae795103957c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 13:30:49 2010 +0000

    2010-03-03  Arno Renevier  <arno at renevier.net>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Gtk]: assertion triggered when geolocation getCurrentPosition without an option argument.
            https://bugs.webkit.org/show_bug.cgi?id=35666
    
            * platform/gtk/GeolocationServiceGtk.cpp:
            (WebCore::GeolocationServiceGtk::startUpdating):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55459 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9a5a92..35dea32 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-03  Arno Renevier  <arno at renevier.net>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Gtk]: assertion triggered when geolocation getCurrentPosition without an option argument.
+        https://bugs.webkit.org/show_bug.cgi?id=35666
+
+        * platform/gtk/GeolocationServiceGtk.cpp:
+        (WebCore::GeolocationServiceGtk::startUpdating):
+
 2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/gtk/GeolocationServiceGtk.cpp b/WebCore/platform/gtk/GeolocationServiceGtk.cpp
index 59c9538..2269ce0 100644
--- a/WebCore/platform/gtk/GeolocationServiceGtk.cpp
+++ b/WebCore/platform/gtk/GeolocationServiceGtk.cpp
@@ -94,7 +94,8 @@ bool GeolocationServiceGtk::startUpdating(PositionOptions* options)
     int timeout = 0;
     if (options) {
         accuracyLevel = options->enableHighAccuracy() ? GEOCLUE_ACCURACY_LEVEL_DETAILED : GEOCLUE_ACCURACY_LEVEL_LOCALITY;
-        timeout = options->timeout();
+        if (options->hasTimeout())
+            timeout = options->timeout();
     }
 
     gboolean result = geoclue_master_client_set_requirements(client, accuracyLevel, timeout,

-- 
WebKit Debian packaging