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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 807450b50339a04a002bdae4b2977e030b16e998
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 26 16:40:50 2002 +0000

            * WebView.subproj/IFHTMLView.mm:
            (-[IFHTMLView validateUserInterfaceItem:]): Switch to this instead
            of validateMenuItem: so that a Copy toolbar button would work.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b063326..989ec9c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-26  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/IFHTMLView.mm:
+        (-[IFHTMLView validateUserInterfaceItem:]): Switch to this instead
+        of validateMenuItem: so that a Copy toolbar button would work.
+
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
         Disable the copy menu item when IFHTMLView has is key
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b063326..989ec9c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-26  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/IFHTMLView.mm:
+        (-[IFHTMLView validateUserInterfaceItem:]): Switch to this instead
+        of validateMenuItem: so that a Copy toolbar button would work.
+
 2002-06-25  Richard Williamson  <rjw at apple.com>
 
         Disable the copy menu item when IFHTMLView has is key
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index 5ea0d20..16b6ae5 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -52,15 +52,13 @@
 }
 
 
-- (BOOL)validateMenuItem:(NSMenuItem *)item 
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item 
 {
     SEL action = [item action];
-
-    if (action == @selector(copy:)){
-        if ([[[self _bridge] selectedText] length] > 0)
-            return YES;
+    if (action == @selector(copy:)) {
+        return [[[self _bridge] selectedText] length] != 0;
     }
-    return NO;
+    return YES;
 }
 
 
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 5ea0d20..16b6ae5 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -52,15 +52,13 @@
 }
 
 
-- (BOOL)validateMenuItem:(NSMenuItem *)item 
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item 
 {
     SEL action = [item action];
-
-    if (action == @selector(copy:)){
-        if ([[[self _bridge] selectedText] length] > 0)
-            return YES;
+    if (action == @selector(copy:)) {
+        return [[[self _bridge] selectedText] length] != 0;
     }
-    return NO;
+    return YES;
 }
 
 

-- 
WebKit Debian packaging