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

[christian at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit e89295752db7235da44fa3d6c5994b2edfb0fee9
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 16:17:26 2009 +0000

    2009-12-08  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Gustavo Noronha Silva.
    
            Point out the meaning of "Content-Disposition" when implementing the
            mime-type-policy-decision-requested signal.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_class_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index b64949a..dfac934 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-08  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Point out the meaning of "Content-Disposition" when implementing the
+        mime-type-policy-decision-requested signal.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_class_init):
+
 2009-12-07  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 4da65aa..2c55d09 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -1452,11 +1452,14 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
      * Decide whether or not to display the given MIME type.  If this
      * signal is not handled, the default behavior is to show the
      * content of the requested URI if WebKit can show this MIME
-     * type; if WebKit is not able to show the MIME type nothing
-     * happens.
+     * type and the content disposition is not a download; if WebKit
+     * is not able to show the MIME type nothing happens.
      *
      * Notice that if you return TRUE, meaning that you handled the
-     * signal, you are expected to have decided what to do, by calling
+     * signal, you are expected to be aware of the "Content-Disposition"
+     * header. A value of "attachment" usually indicates a download
+     * regardless of the MIME type, see also
+     * soup_message_headers_get_content_disposition(). And you must call
      * webkit_web_policy_decision_ignore(),
      * webkit_web_policy_decision_use(), or
      * webkit_web_policy_decision_download() on the @policy_decision

-- 
WebKit Debian packaging