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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit e4170c30b24bf3e2b6147d66d07d6a77182864f8
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 28 02:27:49 2002 +0000

    WebCore:
    
    * khtml/ecma/kjs_navigator.cpp:
    (Navigator::getValueProperty):
    
    Tweaked AppName, Product, and Vendor logic.
    
    WebKit:
    
    * WebView.subproj/WebController.m:
    (-[WebController userAgentForURL:]):
    
    Changed default user agent to Mozilla 1.1.
    
    WebBrowser:
    
    * Debug/DebugUtilities.m:
    (-[DebugUtilities userAgentSubmenuItem]):
    
    Updated all user agents and added new experimental items.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5421ecd..4e05756 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-27  Don Melton  <gramps at apple.com>
+
+        * khtml/ecma/kjs_navigator.cpp:
+        (Navigator::getValueProperty):
+
+	Tweaked AppName, Product, and Vendor logic.
+
 2002-10-27  Darin Adler  <darin at apple.com>
 
         * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5421ecd..4e05756 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-10-27  Don Melton  <gramps at apple.com>
+
+        * khtml/ecma/kjs_navigator.cpp:
+        (Navigator::getValueProperty):
+
+	Tweaked AppName, Product, and Vendor logic.
+
 2002-10-27  Darin Adler  <darin at apple.com>
 
         * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5421ecd..4e05756 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-10-27  Don Melton  <gramps at apple.com>
+
+        * khtml/ecma/kjs_navigator.cpp:
+        (Navigator::getValueProperty):
+
+	Tweaked AppName, Product, and Vendor logic.
+
 2002-10-27  Darin Adler  <darin at apple.com>
 
         * kwq/KWQLoader.mm: (KWQServeRequest): Add a missing "delete job" for one
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index a6bf2f3..3304dd7 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -200,25 +200,32 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
       //kdDebug() << "appName -> IE" << endl;
       return String("Microsoft Internet Explorer");
     }
+#if APPLE_CHANGES
+    // FIXME: Define a fallback result here besides "Konqueror".
+    return String("Konqueror");
+#else
     //kdDebug() << "appName -> Konqueror" << endl;
     return String("Konqueror");
+#endif
   case AppVersion:
     // We assume the string is something like Mozilla/version (properties)
     return String(userAgent.mid(userAgent.find('/') + 1));
   case Product:
-    if (userAgent.find(QString::fromLatin1("Mozilla")) >= 0 &&
+#if APPLE_CHANGES
+    // If we find "Mozilla/5.0" but not "(compatible, ...)" we are a modern Netscape
+    if (userAgent.find(QString::fromLatin1("Mozilla/5.0")) >= 0 &&
         userAgent.find(QString::fromLatin1("compatible")) == -1)
     {
-	//kdDebug() << "appName -> Mozilla" << endl;
-	return String("Gecko");
+        return String("Gecko");
     }
-#if APPLE_CHANGES
+    // FIXME: Should we define a fallback result here besides "Konqueror/khtml"?
     return Undefined();
 #else
     return String("Konqueror/khtml");
 #endif
   case Vendor:
 #if APPLE_CHANGES
+      // FIXME: Should we define a fallback result here besides "KDE"?  Perhaps "Apple"?
       return Undefined();
 #else
       return String("KDE");
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7eaa04c..855b49b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-27  Don Melton  <gramps at apple.com>
+
+        * WebView.subproj/WebController.m:
+        (-[WebController userAgentForURL:]):
+
+	Changed default user agent to Mozilla 1.1.
+
 2002-10-27  Darin Adler  <darin at apple.com>
 
         * Bookmarks.subproj/WebBookmarkProxy.m: (-[WebBookmarkProxy dealloc]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7eaa04c..855b49b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-27  Don Melton  <gramps at apple.com>
+
+        * WebView.subproj/WebController.m:
+        (-[WebController userAgentForURL:]):
+
+	Changed default user agent to Mozilla 1.1.
+
 2002-10-27  Darin Adler  <darin at apple.com>
 
         * Bookmarks.subproj/WebBookmarkProxy.m: (-[WebBookmarkProxy dealloc]):
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 215e200..6bee4f4 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -382,7 +382,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
     // can tell that they are talking to Alexander and not another WebKit client.
     // Maybe also incorporate something that identifies WebKit's involvement.
     
-    return @"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.0.0) Gecko/20020715";
+    return @"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.1) Gecko/20020826";
 }
 
 - (BOOL)supportsTextEncoding
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 215e200..6bee4f4 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -382,7 +382,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
     // can tell that they are talking to Alexander and not another WebKit client.
     // Maybe also incorporate something that identifies WebKit's involvement.
     
-    return @"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.0.0) Gecko/20020715";
+    return @"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.1) Gecko/20020826";
 }
 
 - (BOOL)supportsTextEncoding

-- 
WebKit Debian packaging