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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 26dc06976ad9c674a619ed2356d4b440c60fcef1
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 17:53:43 2003 +0000

    WebKit:
    
            Reviewed by Trey
    
            * Misc.subproj/WebNSPasteboardExtras.h:
            * Misc.subproj/WebNSPasteboardExtras.m:
            (+[NSPasteboard _web_setFindPasteboardString:withOwner:]):
    	New method to put text on the Find pasteboard.
    
    WebBrowser:
    
    	- fixed 3147083 -- Text in the "Google" field should be placed
    	in the find pasteboard
    	- fixed 3148130 -- Safari's Find submenu should use ellipses
    	instead of three dots
    	- fixed 3149466 -- There's no tooltip for the Home icon
    	- fixed 3153618 -- Text drags appears to be accepted by the
    	bookmarks bar
    
    	Reviewed by Trey
    
            * BrowserWindowController.m:
            (-[BrowserWindowController performQuickSearch:]):
    	Use _web_setFindPasteboardString:withOwner: to put search string
    	on find pasteboard
    
            * English.lproj/Browser.nib:
    	added tooltip "Go to the home page."
    
            * English.lproj/MainMenu.nib:
    	replaced all dot dot dots with ellipses
    
            * FavoritesBar.m:
            (-[FavoritesBar updateDropTarget:]):
    	Bail out right away if there are no bookmarks on the pasteboard.
    	This was being checked only at drop time.
    
            * FindPanelController.m:
            (-[FindPanelController controlTextDidEndEditing:]):
    	Now uses _web_setFindPasteboardString:withOwner: (which was
    	extracted from the code here).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3442 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index d8367df..f4f0e28 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -175,7 +175,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1eb140a..e4ba9e8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-24  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Trey
+
+        * Misc.subproj/WebNSPasteboardExtras.h:
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (+[NSPasteboard _web_setFindPasteboardString:withOwner:]):
+	New method to put text on the Find pasteboard.
+
 2003-01-23  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Trey.
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.h b/WebKit/Misc.subproj/WebNSPasteboardExtras.h
index 5b864d5..69d950b 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.h
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.h
@@ -25,4 +25,7 @@ extern NSString *WebURLNamePboardType;
 - (void)_web_writeURL:(NSURL *)URL andTitle:(NSString *)title withOwner:(id)owner;
 - (void)_web_writeURL:(NSURL *)URL andTitle:(NSString *)title withOwner:(id)owner types:(NSArray *)types;
 
+// Sets the text on the NSFindPboard. Returns the new changeCount for the NSFindPboard.
++ (int)_web_setFindPasteboardString:(NSString *)string withOwner:(id)owner;
+
 @end
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index b37127d..5825777 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -102,4 +102,13 @@ NSString *WebURLNamePboardType = nil;
     [self _web_writeURL:URL andTitle:title withOwner:owner types:[NSPasteboard _web_dragTypesForURL]];
 }
 
++ (int)_web_setFindPasteboardString:(NSString *)string withOwner:(id)owner
+{
+    NSPasteboard *findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
+    [findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:owner];
+    [findPasteboard setString:string forType:NSStringPboardType];
+    return [findPasteboard changeCount];
+}
+
+
 @end

-- 
WebKit Debian packaging