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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6ba0d0b86d17d203ec40126a470722674827448d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 17:04:39 2009 +0000

    2009-12-16  Martin Robinson  <martin.james.robinson at gmail.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] webkit_web_navigation_action_get_button() documentation
            https://bugs.webkit.org/show_bug.cgi?id=25555
    
            Small documentation improvement for webkit_web_navigation_action_get_button.
    
            * webkit/webkitwebnavigationaction.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 0a2665c..42b57c8 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-16  Martin Robinson  <martin.james.robinson at gmail.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] webkit_web_navigation_action_get_button() documentation
+        https://bugs.webkit.org/show_bug.cgi?id=25555
+
+        Small documentation improvement for webkit_web_navigation_action_get_button.
+
+        * webkit/webkitwebnavigationaction.cpp:
+
 2009-12-13  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/gtk/webkit/webkitwebnavigationaction.cpp b/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
index c866c0f..f421f40 100644
--- a/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
+++ b/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
@@ -177,7 +177,9 @@ static void webkit_web_navigation_action_class_init(WebKitWebNavigationActionCla
     /**
      * WebKitWebNavigationAction:button:
      *
-     * The button used to click if the action was a mouse event.
+     * 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 the value will be -1.
      *
      * Since: 1.0.3
      */
@@ -308,8 +310,9 @@ void webkit_web_navigation_action_set_original_uri(WebKitWebNavigationAction* na
  * webkit_web_navigation_action_get_button:
  * @navigationAction: a #WebKitWebNavigationAction
  *
- * Returns the mouse button used to click if the action was a mouse event.
- * Otherwise returns -1.
+ * 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.
  *
  * Return value: the mouse button used to click
  *

-- 
WebKit Debian packaging