[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 f69d83087eb950a5f47ee71850856394da7e081f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 17 15:51:56 2003 +0000

            Reviewed by me
    
            * Misc.subproj/WebNSURLExtras.m:
            (-[NSURL _web_URLStringLength]): Fix premature use of new CFURL API.
    	New code is ifdef'ed out for now until everyone has revved.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4663 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bbd79e7..0adffc8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2003-07-17  Ken Kocienda  <kocienda at apple.com>
 
+        Reviewed by me
+
+        * Misc.subproj/WebNSURLExtras.m:
+        (-[NSURL _web_URLStringLength]): Fix premature use of new CFURL API.
+	New code is ifdef'ed out for now until everyone has revved.
+
+2003-07-17  Ken Kocienda  <kocienda at apple.com>
+
         Reviewed by Darin
 
         * WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index c362069..ba40717 100644
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -64,6 +64,9 @@
 
 - (int)_web_URLStringLength
 {
+    return [[self _web_absoluteString] length];
+#if 0
+    // URL API FIXME: Convert to new URL API when available
     int length = 0;
     if (!CFURLGetBaseURL((CFURLRef)self)) {
         length = CFURLGetBytes((CFURLRef)self, NULL, 0);
@@ -72,6 +75,7 @@
         length = [[self absoluteString] length];
     }
     return length;
+#endif
 }
 
 @end

-- 
WebKit Debian packaging