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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 03723fea290c92b1c4e4bd458bb364df7edd7b70
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 24 03:38:57 2003 +0000

    	Build breakage fix:
    
    	Fix WebKit to build with the latest Foundation.
    
            * Misc.subproj/WebNSURLExtras.h:
            * Misc.subproj/WebNSURLExtras.m:
            (-[NSURL _webkit_isJavaScriptURL]):
            (-[NSURL _webkit_scriptIfJavaScriptURL]):
            (-[NSURL _webkit_isFTPDirectoryURL]):
            (-[NSString _webkit_isFTPDirectoryURL]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4700 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7ff09ac..a92465e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-07-23  Maciej Stachowiak  <mjs at apple.com>
+
+	Build breakage fix:
+	
+	Fix WebKit to build with the latest Foundation.
+	
+        * Misc.subproj/WebNSURLExtras.h:
+        * Misc.subproj/WebNSURLExtras.m:
+        (-[NSURL _webkit_isJavaScriptURL]):
+        (-[NSURL _webkit_scriptIfJavaScriptURL]):
+        (-[NSURL _webkit_isFTPDirectoryURL]):
+        (-[NSString _webkit_isFTPDirectoryURL]):
+
 2003-07-23  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3311725:  Added support for key/value binding. 
diff --git a/WebKit/Misc.subproj/WebNSURLExtras.h b/WebKit/Misc.subproj/WebNSURLExtras.h
index 158786d..69ed706 100644
--- a/WebKit/Misc.subproj/WebNSURLExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLExtras.h
@@ -36,5 +36,7 @@
 // methods are removed from Foundation
 - (NSString *)_webkit_stringByReplacingValidPercentEscapes;
 - (NSString *)_webkit_scriptIfJavaScriptURL;
+- (BOOL)_webkit_isJavaScriptURL;
+- (BOOL)_webkit_isFTPDirectoryURL;
 
 @end
diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index 82a0653..8ac4c06 100644
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -148,17 +148,17 @@ static inline void ReleaseIfNotNULL(CFTypeRef object)
 
 - (BOOL)_webkit_isJavaScriptURL
 {
-    return [[self absoluteString] _web_isJavaScriptURL];
+    return [[self absoluteString] _webkit_isJavaScriptURL];
 }
 
 - (NSString *)_webkit_scriptIfJavaScriptURL
 {
-    return [[self absoluteString] _web_scriptIfJavaScriptURL];
+    return [[self absoluteString] _webkit_scriptIfJavaScriptURL];
 }
 
 - (BOOL)_webkit_isFTPDirectoryURL
 {
-    return [[self absoluteString] _web_isFTPDirectoryURL];
+    return [[self absoluteString] _webkit_isFTPDirectoryURL];
 }
 
 - (BOOL)_webkit_shouldLoadAsEmptyDocument
@@ -232,4 +232,14 @@ static int hexDigitValue(char c)
     return [[self substringFromIndex:11] _webkit_stringByReplacingValidPercentEscapes];
 }
 
- at end
\ No newline at end of file
+- (BOOL)_webkit_isFTPDirectoryURL
+{
+    int length = [self length];
+    if (length < 5) {  // 5 is length of "ftp:/"
+	return NO;
+    }
+    unichar lastChar = [self characterAtIndex:length - 1];
+    return lastChar == '/' && [self _web_hasCaseInsensitivePrefix:@"ftp:"];
+}
+
+ at end

-- 
WebKit Debian packaging