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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 1a70588948d78be32ae4777dcc9d4889d7224021
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 27 17:32:36 2002 +0000

    WebKit:
    
    	Added support for dragging links the the dock.
    	Created new pasteboard types WebURLPboardType WebURLNamePboardType that the dock requires.
    
            * Misc.subproj/WebNSPasteboardExtras.h:
            * Misc.subproj/WebNSPasteboardExtras.m:
            (+[NSPasteboard initialize]): set WebURLPboardType and WebURLNamePboardType
            (-[NSPasteboard _web_writeURL:andTitle:withOwner:]): use WebURLPboardType and WebURLNamePboardType
            * WebKit.exp: export WebURLPboardType and WebURLNamePboardType
    
    WebBrowser:
    
    	Added support for dragging links the the dock.
    	Created new pasteboard types WebURLPboardType WebURLNamePboardType that the dock requires.
    
            * BrowserWebBookmarkExtras.m:
            (+[WebBookmark writeBookmarks:toPasteboard:withOwner:]): use WebURLPboardType and WebURLNamePboardType
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a1eac13..2275b7a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-27  Chris Blumenberg  <cblu at apple.com>
+
+	Added support for dragging links the the dock.
+	Created new pasteboard types WebURLPboardType WebURLNamePboardType that the dock requires.
+
+        * Misc.subproj/WebNSPasteboardExtras.h:
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (+[NSPasteboard initialize]): set WebURLPboardType and WebURLNamePboardType
+        (-[NSPasteboard _web_writeURL:andTitle:withOwner:]): use WebURLPboardType and WebURLNamePboardType
+        * WebKit.exp: export WebURLPboardType and WebURLNamePboardType
+
 2002-09-27  Maciej Stachowiak  <mjs at apple.com>
 
         * Panels.subproj/WebAuthenticationPanel.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a1eac13..2275b7a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-27  Chris Blumenberg  <cblu at apple.com>
+
+	Added support for dragging links the the dock.
+	Created new pasteboard types WebURLPboardType WebURLNamePboardType that the dock requires.
+
+        * Misc.subproj/WebNSPasteboardExtras.h:
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (+[NSPasteboard initialize]): set WebURLPboardType and WebURLNamePboardType
+        (-[NSPasteboard _web_writeURL:andTitle:withOwner:]): use WebURLPboardType and WebURLNamePboardType
+        * WebKit.exp: export WebURLPboardType and WebURLNamePboardType
+
 2002-09-27  Maciej Stachowiak  <mjs at apple.com>
 
         * Panels.subproj/WebAuthenticationPanel.m:
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.h b/WebKit/Misc.subproj/WebNSPasteboardExtras.h
index 5fb68fa..7dccaa8 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.h
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.h
@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+extern NSString *WebURLPboardType;
+extern NSString *WebURLNamePboardType;
 
 @interface NSPasteboard (WebExtras)
 
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 473ad8c..1f7c612 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -15,8 +15,17 @@
 
 #import <ApplicationServices/ApplicationServicesPriv.h>
 
+NSString *WebURLPboardType = nil;
+NSString *WebURLNamePboardType = nil;
+
 @implementation NSPasteboard (WebExtras)
 
++ (void)initialize
+{
+    CreatePasteboardFlavorTypeName('url ', (CFStringRef*)&WebURLPboardType);
+    CreatePasteboardFlavorTypeName('urln', (CFStringRef*)&WebURLNamePboardType);
+}
+
 + (NSArray *)_web_dragTypesForURL
 {
     return [NSArray arrayWithObjects:NSURLPboardType, NSStringPboardType, NSFilenamesPboardType, nil];
@@ -71,15 +80,10 @@
     [URL writeToPasteboard:self];
     [self setString:[URL absoluteString] forType:NSStringPboardType];
     [WebURLsWithTitles writeURLs:[NSArray arrayWithObject:URL] andTitles:[NSArray arrayWithObject:title] toPasteboard:self];
-
-    NSString *flavor = nil;
-    CreatePasteboardFlavorTypeName('url ', (CFStringRef*)&flavor);
-    [self setString:[URL absoluteString] forType:flavor];
-    [flavor release];
-    
-    CreatePasteboardFlavorTypeName('urln', (CFStringRef*)&flavor);
-    [self setString:title forType:flavor];
-    [flavor release];
+    [self setString:[URL absoluteString] forType:WebURLPboardType];
+    if(title && ![title isEqualToString:@""]){
+        [self setString:title forType:WebURLNamePboardType];
+    }
 }
 
 @end
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 84bd7ee..f5cb45b 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -37,5 +37,7 @@ _WebIconSmallSize
 _WebIconMediumSize
 _WebIconLargeSize
 _WebIconNotificationUserInfoSiteURLKey
+_WebURLPboardType
+_WebURLNamePboardType
 
 

-- 
WebKit Debian packaging