[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4a50561089ee97d2f9cfd005425b9eb7e687a052
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 14:23:11 2010 +0000

    2010-03-06  Arno Renevier  <arno at renevier.net>
    
            Reviewed by Eric Seidel.
    
            [Gtk] GEOLOCATION_POLICY_DECISION_CANCELLED unused
            https://bugs.webkit.org/show_bug.cgi?id=35803
    
            * webkit/webkitwebview.cpp:
            (DNDContentsRequest::webkit_web_view_class_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 516f4bf..bed5d84 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-06  Arno Renevier  <arno at renevier.net>
+
+        Reviewed by Eric Seidel.
+
+        [Gtk] GEOLOCATION_POLICY_DECISION_CANCELLED unused
+        https://bugs.webkit.org/show_bug.cgi?id=35803
+
+        * webkit/webkitwebview.cpp:
+        (DNDContentsRequest::webkit_web_view_class_init):
+
 2010-03-03  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index c3ad70b..8ca31e1 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2249,7 +2249,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
      *
      * Since: 1.1.23
      */
-    webkit_web_view_signals[GEOLOCATION_POLICY_DECISION_REQUESTED] = g_signal_new("geolocation-policy-decision-cancelled",
+    webkit_web_view_signals[GEOLOCATION_POLICY_DECISION_CANCELLED] = g_signal_new("geolocation-policy-decision-cancelled",
             G_TYPE_FROM_CLASS(webViewClass),
             (GSignalFlags)(G_SIGNAL_RUN_LAST),
             0,

-- 
WebKit Debian packaging