[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7d7ab26ee8f21bc24592c21c53b23e2656c08374
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 14:27:17 2010 +0000

    2010-02-18  Diego Escalante Urrelo  <descalante at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] WebKitDownload documentation is incomplete
            https://bugs.webkit.org/show_bug.cgi?id=35018
    
            Concretely the error signal was undocumented. Also two relevant enums
            were not included.
    
            * docs/webkitgtk-sections.txt:
            * docs/webkitgtk.types:
            * webkit/webkitdownload.cpp:
            (webkit_download_class_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54959 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e72314f..43d2d20 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-18  Diego Escalante Urrelo  <descalante at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] WebKitDownload documentation is incomplete
+        https://bugs.webkit.org/show_bug.cgi?id=35018
+
+        Concretely the error signal was undocumented. Also two relevant enums
+        were not included.
+
+        * docs/webkitgtk-sections.txt:
+        * docs/webkitgtk.types:
+        * webkit/webkitdownload.cpp:
+        (webkit_download_class_init):
+
 2010-02-17  Dmitry Titov  <dimich at chromium.org>
 
         Reviewed by David Levin, Darin Fisher, Simon Hausmann.
diff --git a/WebKit/gtk/docs/webkitgtk-sections.txt b/WebKit/gtk/docs/webkitgtk-sections.txt
index 9574280..2379c8b 100644
--- a/WebKit/gtk/docs/webkitgtk-sections.txt
+++ b/WebKit/gtk/docs/webkitgtk-sections.txt
@@ -126,6 +126,8 @@ WebKitWebFrameClass
 
 <SECTION>
 <FILE>webkitdownload</FILE>
+WebKitDownloadError
+WebKitDownloadStatus
 <TITLE>WebKitDownload</TITLE>
 WebKitDownload
 webkit_download_cancel
@@ -157,9 +159,7 @@ WEBKIT_TYPE_DOWNLOAD_STATUS
 webkit_download_get_type
 WebKitDownload
 WebKitDownloadClass
-WebKitDownloadError
 WebKitDownloadPrivate
-WebKitDownloadStatus
 </SECTION>
 
 <SECTION>
diff --git a/WebKit/gtk/docs/webkitgtk.types b/WebKit/gtk/docs/webkitgtk.types
index b8ed5be..23f3382 100644
--- a/WebKit/gtk/docs/webkitgtk.types
+++ b/WebKit/gtk/docs/webkitgtk.types
@@ -1,12 +1,13 @@
 #include <webkit/webkit.h>
 
+webkit_download_get_type
+webkit_navigation_response_get_type
 webkit_network_request_get_type
 webkit_web_back_forward_list_get_type
 webkit_web_history_item_get_type
 webkit_web_inspector_get_type
 webkit_web_settings_get_type
 webkit_web_view_get_type
-webkit_navigation_response_get_type
 webkit_web_view_target_info_get_type
 webkit_web_window_features_get_type
 
diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp
index 0bd6dec..8f3214e 100644
--- a/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/WebKit/gtk/webkit/webkitdownload.cpp
@@ -228,10 +228,14 @@ static void webkit_download_class_init(WebKitDownloadClass* downloadClass)
     /**
      * WebKitDownload::error:
      * @download: the object on which the signal is emitted
-     * @current_bytes: the current count of bytes downloaded
-     * @total_bytes: the total bytes count in the downloaded file, aka file size.
+     * @error_code: the corresponding error code
+     * @error_detail: detailed error code for the error, see
+     * #WebKitDownloadError
+     * @reason: a string describing the error
      *
-     * Indicates an error in the download.
+     * Emitted when @download is interrupted either by user action or by
+     * network errors, @error_detail will take any value of
+     * #WebKitDownloadError.
      *
      * Since: 1.1.2
      */

-- 
WebKit Debian packaging