[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0f52535747befcd1f378129413e6d487bd7a6fd8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 07:58:38 2010 +0000

    2010-10-19  Prof. MAAD  <himself at prof-maad.org>
    
            Reviewed by Xan Lopez.
    
            [GTK] Correct erroneous documentation for webkit_web_navigation_action_get_button()
            https://bugs.webkit.org/show_bug.cgi?id=46723
    
            * WebKit/gtk/webkit/webkitwebnavigationaction.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 79173c2..a3cdd17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-19  Prof. MAAD  <himself at prof-maad.org>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Correct erroneous documentation for webkit_web_navigation_action_get_button()
+        https://bugs.webkit.org/show_bug.cgi?id=46723
+
+        * WebKit/gtk/webkit/webkitwebnavigationaction.cpp:
+
 2010-10-19  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/webkit/webkitwebnavigationaction.cpp b/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
index f421f40..ce5dd92 100644
--- a/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
+++ b/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
@@ -177,8 +177,8 @@ static void webkit_web_navigation_action_class_init(WebKitWebNavigationActionCla
     /**
      * WebKitWebNavigationAction:button:
      *
-     * The DOM identifier for the mouse button used to click. DOM button values
-     * are 0, 1 and 2 for left, middle and right buttons. If the action was not
+     * The GTK+ identifier for the mouse button used to click. Notice that GTK+ button values
+     * are 1, 2 and 3 for left, middle and right buttons, so they are DOM button values +1. If the action was not
      * initiated by a mouse click the value will be -1.
      *
      * Since: 1.0.3
@@ -310,9 +310,9 @@ void webkit_web_navigation_action_set_original_uri(WebKitWebNavigationAction* na
  * webkit_web_navigation_action_get_button:
  * @navigationAction: a #WebKitWebNavigationAction
  *
- * Returns the DOM identifier for the mouse button used to click.
- * DOM button values are 0, 1 and 2 for left, middle and right buttons.
- * If the action was not initiated by a mouse click, returns -1.
+ * The GTK+ identifier for the mouse button used to click. Notice that GTK+ button values
+ * are 1, 2 and 3 for left, middle and right buttons, so they are DOM button values +1. If the action was not
+ * initiated by a mouse click the value will be -1.
  *
  * Return value: the mouse button used to click
  *

-- 
WebKit Debian packaging