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

sullivan sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:21:44 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit a389de5ce0c9fb72e95e3b16bc86986d98292cff
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 18:38:25 2003 +0000

            Reviewed by Trey
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView takeFindStringFromSelection:]):
    	Now uses new _web_setFindPasteboardString:withOwner: to share code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e4ba9e8..bb671e9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,14 @@
 
         Reviewed by Trey
 
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView takeFindStringFromSelection:]):
+	Now uses new _web_setFindPasteboardString:withOwner: to share code.
+
+2003-01-24  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Trey
+
         * Misc.subproj/WebNSPasteboardExtras.h:
         * Misc.subproj/WebNSPasteboardExtras.m:
         (+[NSPasteboard _web_setFindPasteboardString:withOwner:]):
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 3ee2b80..b9ede00 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -21,6 +21,7 @@
 #import <WebKit/WebIconLoader.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebNSImageExtras.h>
+#import <WebKit/WebNSPasteboardExtras.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPluginController.h>
 #import <WebKit/WebTextRenderer.h>
@@ -69,18 +70,12 @@
 
 - (IBAction)takeFindStringFromSelection:(id)sender
 {
-    NSPasteboard *findPasteboard;
-
     if (![self hasSelection]) {
         NSBeep();
         return;
     }
-    
-    // Note: Can't use writeSelectionToPasteboard:type: here, though it seems equivalent, because
-    // it doesn't declare the types to the pasteboard and thus doesn't bump the change count.
-    findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
-    [findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
-    [findPasteboard setString:[self selectedString] forType:NSStringPboardType];
+
+    [NSPasteboard _web_setFindPasteboardString:[self selectedString] withOwner:self];
 }
 
 - (void)copy:(id)sender

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list