[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 8d6af5306c324934152b1bd25b4514b8a01c4838
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 21:03:08 2002 +0000

    	Character set information now accessible via WebResourceResponse object,
    	rather than from WebResourceHandle.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidReceiveData:data:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a14fe72..a0ebb96 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-09  Ken Kocienda  <kocienda at apple.com>
+
+	Character set information now accessible via WebResourceResponse object,
+	rather than from WebResourceHandle.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+
 2002-09-09  Chris Blumenberg  <cblu at apple.com>
 
 	Re-enable wizzy scaling.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a14fe72..a0ebb96 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-09-09  Ken Kocienda  <kocienda at apple.com>
+
+	Character set information now accessible via WebResourceResponse object,
+	rather than from WebResourceHandle.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+
 2002-09-09  Chris Blumenberg  <cblu at apple.com>
 
 	Re-enable wizzy scaling.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 6d01b46..1b03336 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -196,7 +196,7 @@
             contentType = @"text/html";
         
         [dataSource _setContentType:contentType];
-        [dataSource _setEncoding:[handle characterSet]];
+        [dataSource _setEncoding:[[handle response] characterSet]];
         
         // retain the downloadProgressHandler just in case this is a download.
         // Alexander releases the WebController if no window is created for it.
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 6d01b46..1b03336 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -196,7 +196,7 @@
             contentType = @"text/html";
         
         [dataSource _setContentType:contentType];
-        [dataSource _setEncoding:[handle characterSet]];
+        [dataSource _setEncoding:[[handle response] characterSet]];
         
         // retain the downloadProgressHandler just in case this is a download.
         // Alexander releases the WebController if no window is created for it.

-- 
WebKit Debian packaging