[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 bdf57291fcbd9c8e7350ce5a2a02bea603be81cd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 5 16:47:26 2003 +0000

            Reviewed by John.
    
    	- fixed 3279206 -- REGRESSION: new page does not load after selecting item from list and hitting 'Go' button
    
            * khtml/html/html_formimpl.cpp: (HTMLInputElementImpl::encoding): Use value() in a couple of places
            that were still directly using m_value.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0e3cc3b..0a12f2d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,15 @@
 
         Reviewed by John.
 
+	- fixed 3279206 -- REGRESSION: new page does not load after selecting item from list and hitting 'Go' button
+
+        * khtml/html/html_formimpl.cpp: (HTMLInputElementImpl::encoding): Use value() in a couple of places
+        that were still directly using m_value.
+
+2003-06-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
 	- fixed 3278079 -- REGRESSION: UTF-8 page claiming to be UTF-16 in XML header gives garbage characters
 
         * khtml/misc/decoder.cpp: (Decoder::setEncoding): Add EncodingFromXMLHeader as one of the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0e3cc3b..0a12f2d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,15 @@
 
         Reviewed by John.
 
+	- fixed 3279206 -- REGRESSION: new page does not load after selecting item from list and hitting 'Go' button
+
+        * khtml/html/html_formimpl.cpp: (HTMLInputElementImpl::encoding): Use value() in a couple of places
+        that were still directly using m_value.
+
+2003-06-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
 	- fixed 3278079 -- REGRESSION: UTF-8 page claiming to be UTF-16 in XML header gives garbage characters
 
         * khtml/misc/decoder.cpp: (Decoder::setEncoding): Add EncodingFromXMLHeader as one of the
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index d7bed9e..de0584e 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1491,11 +1491,10 @@ bool HTMLInputElementImpl::encoding(const QTextCodec* codec, khtml::encodingList
 
             if (m_activeSubmit)
             {
-                QString enc_str = m_value.isNull() ?
-                    static_cast<RenderSubmitButton*>(m_render)->defaultLabel() : value().string();
-
-                if(!enc_str.isEmpty())
-                {
+                QString enc_str = value().string();
+                if (enc_str.isEmpty())
+                    enc_str = static_cast<RenderSubmitButton*>(m_render)->defaultLabel();
+                if (!enc_str.isEmpty()) {
                     encoding += fixUpfromUnicode(codec, enc_str);
                     return true;
                 }
@@ -1567,7 +1566,7 @@ bool HTMLInputElementImpl::encoding(const QTextCodec* codec, khtml::encodingList
             break;
         }
         case ISINDEX:
-            encoding += fixUpfromUnicode(codec, m_value.string());
+            encoding += fixUpfromUnicode(codec, value().string());
             return true;
     }
     return false;

-- 
WebKit Debian packaging