[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 f491b7c340a47fe1c05c30c89d3a03970e914e3a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 14 01:28:20 2002 +0000

            Reviewed by Don.
    
            * WebView.subproj/WebController.m: (-[WebController userAgentForURL:]):
    	Add "(like Gecko)" string and change "WebKit" to "AppleWebKit".
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for these changes.
            * Misc.subproj/WebUnicode.h: No need for & 0xFF since we cast to unsigned char.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3046 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index affca41..4cc80df 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+        * WebView.subproj/WebController.m: (-[WebController userAgentForURL:]):
+	Add "(like Gecko)" string and change "WebKit" to "AppleWebKit".
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for these changes.
+        * Misc.subproj/WebUnicode.h: No need for & 0xFF since we cast to unsigned char.
+
 2002-12-13  John Sullivan  <sullivan at apple.com>
 
 	- WebKit part of fix for 3028061 -- visiting a bookmarked site
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 1c12b97..d71b36d 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -70,8 +70,8 @@
 "Library/Internet Plug-Ins"
 "Library/Preferences/Explorer/Favorites.html"
 "Lucida Grande"
-"Mozilla/5.0 (Macintosh; U; PPC; %@) WebKit/%@ %@"
-"Mozilla/5.0 (Macintosh; U; PPC; %@) WebKit/%@"
+"Mozilla/5.0 (Macintosh; U; PPC; %@) AppleWebKit/%@ (like Gecko) %@"
+"Mozilla/5.0 (Macintosh; U; PPC; %@) AppleWebKit/%@ (like Gecko)"
 "NETSCAPE2"
 "NP_GetEntryPoints"
 "NP_Initialize"
diff --git a/WebKit/Misc.subproj/WebUnicode.h b/WebKit/Misc.subproj/WebUnicode.h
index a323cc8..f02ed9e 100644
--- a/WebKit/Misc.subproj/WebUnicode.h
+++ b/WebKit/Misc.subproj/WebUnicode.h
@@ -25,8 +25,8 @@ extern UniChar *shapedString(UniChar *uc, int stringLength, int from, int len, i
 }
 #endif
 
-#define WK_CELL(ucs) ((unsigned char) ucs & 0xff)
-#define WK_ROW(ucs) ((unsigned char) (ucs>>8)&0xff)
+#define WK_CELL(ucs) ((unsigned char)(ucs))
+#define WK_ROW(ucs) ((unsigned char)(ucs>>8))
 
 // surrogate ranges
 enum {
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index fc275e0..c7335d5 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -375,10 +375,10 @@ NSString *WebElementStringKey = 		@"WebElementString";
 
     NSString *userAgent;
     if ([applicationName length]) {
-        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) WebKit/%@ %@",
+        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) AppleWebKit/%@ (like Gecko) %@",
             language, sourceVersion, applicationName];
     } else {
-        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) WebKit/%@",
+        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) AppleWebKit/%@ (like Gecko)",
             language, sourceVersion];
     }
     
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index fc275e0..c7335d5 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -375,10 +375,10 @@ NSString *WebElementStringKey = 		@"WebElementString";
 
     NSString *userAgent;
     if ([applicationName length]) {
-        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) WebKit/%@ %@",
+        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) AppleWebKit/%@ (like Gecko) %@",
             language, sourceVersion, applicationName];
     } else {
-        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) WebKit/%@",
+        userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; PPC; %@) AppleWebKit/%@ (like Gecko)",
             language, sourceVersion];
     }
     

-- 
WebKit Debian packaging