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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 72a1c7dcd82198305967205dbf26f43924ee9609
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 31 23:13:30 2003 +0000

            Reviewed by Richard.
    
            * khtml/misc/decoder.cpp: (Decoder::decode): Turn off Japanese auto-detect.
    	It was causing us to use Japanese encoding on pages that were UTF-8.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3530 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c002740..4173607 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2003-01-31  Darin Adler  <darin at apple.com>
 
+        Reviewed by Richard.
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Turn off Japanese auto-detect.
+	It was causing us to use Japanese encoding on pages that were UTF-8.
+
+2003-01-31  Darin Adler  <darin at apple.com>
+
         * Resources/Info.plist: Removed unused file.
 
 2003-01-31  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c002740..4173607 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2003-01-31  Darin Adler  <darin at apple.com>
 
+        Reviewed by Richard.
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Turn off Japanese auto-detect.
+	It was causing us to use Japanese encoding on pages that were UTF-8.
+
+2003-01-31  Darin Adler  <darin at apple.com>
+
         * Resources/Info.plist: Removed unused file.
 
 2003-01-31  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index 5386318..17f2590 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -479,7 +479,7 @@ QString Decoder::decode(const char *data, int len)
 
  found:
 #if APPLE_CHANGES
-    if (!haveEncoding)
+    if (0) // not ready to turn this on yet; seems to cause problems
 #else
     if (!haveEncoding && KGlobal::locale()->languageList()[0] == "ja")
 #endif

-- 
WebKit Debian packaging