[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 8a43743bac6610387c495863ae232d5348e2d659
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 20 21:57:33 2001 +0000

    Fixes some rendering issues, like those that sniff for browser types
    and versions. As part of this, we now send a MSIE User-Agent string.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/dom/html_document.cpp b/WebCore/khtml/dom/html_document.cpp
index ec7bff6..91ab8e1 100644
--- a/WebCore/khtml/dom/html_document.cpp
+++ b/WebCore/khtml/dom/html_document.cpp
@@ -178,8 +178,10 @@ HTMLCollection HTMLDocument::all() const
 
 DOMString HTMLDocument::cookie() const
 {
+// FIXME: implement cookies
 #ifdef _KWQ_
     fprintf(stderr, "ERROR %s:%d  %s (NOT YET IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__);
+    return DOMString("");
 #else
     QCString replyType;
     QByteArray params, reply;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index c40f5cb..9800307 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -287,8 +287,6 @@ QVariant KHTMLPart::executeScript( const QString &script )
 // passed to the interpreter.
 QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
 {
-    return QVariant();
-#if 0
     KJSProxy *proxy = jScript();
     
     if (!proxy) {
@@ -310,7 +308,6 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     
     //kdDebug(6050) << "KHTMLPart::executeScript - done" << endl;
     return ret;
-#endif
 }
 
 void KHTMLPart::setJavaEnabled( bool enable )
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index c40f5cb..9800307 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -287,8 +287,6 @@ QVariant KHTMLPart::executeScript( const QString &script )
 // passed to the interpreter.
 QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
 {
-    return QVariant();
-#if 0
     KJSProxy *proxy = jScript();
     
     if (!proxy) {
@@ -310,7 +308,6 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     
     //kdDebug(6050) << "KHTMLPart::executeScript - done" << endl;
     return ret;
-#endif
 }
 
 void KHTMLPart::setJavaEnabled( bool enable )
diff --git a/WebCore/kwq/KWQKProtocolManager.mm b/WebCore/kwq/KWQKProtocolManager.mm
index 612b383..fa5efeb 100644
--- a/WebCore/kwq/KWQKProtocolManager.mm
+++ b/WebCore/kwq/KWQKProtocolManager.mm
@@ -47,6 +47,7 @@ QString KProtocolManager::httpProxy()
 QString KProtocolManager::userAgentForHost( const QString& )
 {
     _logNotYetImplemented();
-    return QString("intrigue-0.000001");
+    // make us look like msie for now
+    return QString("Mozilla/4.0 (compatible; MSIE 5.12; Mac_PowerPC)");
 }
 
diff --git a/WebCore/src/kdelibs/khtml/dom/html_document.cpp b/WebCore/src/kdelibs/khtml/dom/html_document.cpp
index ec7bff6..91ab8e1 100644
--- a/WebCore/src/kdelibs/khtml/dom/html_document.cpp
+++ b/WebCore/src/kdelibs/khtml/dom/html_document.cpp
@@ -178,8 +178,10 @@ HTMLCollection HTMLDocument::all() const
 
 DOMString HTMLDocument::cookie() const
 {
+// FIXME: implement cookies
 #ifdef _KWQ_
     fprintf(stderr, "ERROR %s:%d  %s (NOT YET IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__);
+    return DOMString("");
 #else
     QCString replyType;
     QByteArray params, reply;
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index c40f5cb..9800307 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -287,8 +287,6 @@ QVariant KHTMLPart::executeScript( const QString &script )
 // passed to the interpreter.
 QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
 {
-    return QVariant();
-#if 0
     KJSProxy *proxy = jScript();
     
     if (!proxy) {
@@ -310,7 +308,6 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     
     //kdDebug(6050) << "KHTMLPart::executeScript - done" << endl;
     return ret;
-#endif
 }
 
 void KHTMLPart::setJavaEnabled( bool enable )
diff --git a/WebCore/src/kwq/KWQKProtocolManager.mm b/WebCore/src/kwq/KWQKProtocolManager.mm
index 612b383..fa5efeb 100644
--- a/WebCore/src/kwq/KWQKProtocolManager.mm
+++ b/WebCore/src/kwq/KWQKProtocolManager.mm
@@ -47,6 +47,7 @@ QString KProtocolManager::httpProxy()
 QString KProtocolManager::userAgentForHost( const QString& )
 {
     _logNotYetImplemented();
-    return QString("intrigue-0.000001");
+    // make us look like msie for now
+    return QString("Mozilla/4.0 (compatible; MSIE 5.12; Mac_PowerPC)");
 }
 

-- 
WebKit Debian packaging