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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5c25495cc7a2d69a06f0397117654a2deb653a5d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 20 18:49:43 2003 +0000

    	Conditionally excluded fix for 3446192.  We'll enable the fix once 3446669
    	has been fixed.  This patch switches to the new UTI typing API for pasteboard types.
    
            Reviewed by Ken.
    
            * Misc.subproj/WebNSPasteboardExtras.m:
            (+[NSPasteboard initialize]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8e7d032..f181c69 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2003-10-20  Richard Williamson   <rjw at apple.com>
 
+	Conditionally excluded fix for 3446192.  We'll enable the fix once 3446669
+	has been fixed.  This patch switches to the new UTI typing API for pasteboard types.
+ 
+        Reviewed by Ken.
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (+[NSPasteboard initialize]):
+
+2003-10-20  Richard Williamson   <rjw at apple.com>
+
 	Fixed 3456103.  Don't assert, just check for inappropriate state.
 	Reviewed by Hyatt
 
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 2e8b348..76e69ad 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -23,8 +23,19 @@ NSString *WebURLNamePboardType = nil;
 
 + (void)initialize
 {
+    // FIXME  The code below addresses 3446192.  However we can't enable until 3446669 has been fixed.
+#ifdef UTI_PB_API
+    CFStringRef osTypeString = UTCreateStringForOSType('url ');
+    CFStringRef utiTypeString = UTTypeCreatePreferredIdentifierForTag( kUTTagClassOSType, osTypeString, NULL );
+    WebURLPboardType = (NSString *)UTTypeCopyPreferredTagWithClass( kUTTagClassNSPboardType, utiTypeString );
+    
+    osTypeString = UTCreateStringForOSType('urln');
+    utiTypeString = UTTypeCreatePreferredIdentifierForTag( kUTTagClassOSType, osTypeString, NULL );
+    WebURLNamePboardType = (NSString *)UTTypeCopyPreferredTagWithClass( kUTTagClassNSPboardType, utiTypeString );
+#else
     CreatePasteboardFlavorTypeName('url ', (CFStringRef*)&WebURLPboardType);
     CreatePasteboardFlavorTypeName('urln', (CFStringRef*)&WebURLNamePboardType);
+#endif
 }
 
 + (NSArray *)_web_writableDragTypesForURL

-- 
WebKit Debian packaging