[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 8179556f6f7acbfff8b0f6ceefb52d63da1ae2e7
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 05:03:16 2002 +0000

    	Fixed: 3025868 - Plugin context menu disappears then reappears if you click off of it
    
    	Also fixed some rare dragging weirdness in WebHTMLView. If you attempted to drag a plug-in after dragging an image, the image would drag again.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView mouseDragged:]): subclass and do nothing to prevent calling mouseDragged in WebHTMLView
            (-[WebBaseNetscapePluginView performKeyEquivalent:]): no changes to this method, removed menuForEvent, wasn't needed after all
            * Plugins.subproj/WebNetscapePluginStream.m:
            (-[WebNetscapePluginStream stop]): minor clean-up
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2388 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 42920d8..17eb3eb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-20  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3025868 - Plugin context menu disappears then reappears if you click off of it
+
+	Also fixed some rare dragging weirdness in WebHTMLView. If you attempted to drag a plug-in after dragging an image, the image would drag again.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView mouseDragged:]): subclass and do nothing to prevent calling mouseDragged in WebHTMLView
+        (-[WebBaseNetscapePluginView performKeyEquivalent:]): no changes to this method, removed menuForEvent, wasn't needed after all
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginStream stop]): minor clean-up
+
 2002-10-20  Darin Adler  <darin at apple.com>
 
 	- fixed a minor problem with autorelease I just ran into
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 42920d8..17eb3eb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-20  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3025868 - Plugin context menu disappears then reappears if you click off of it
+
+	Also fixed some rare dragging weirdness in WebHTMLView. If you attempted to drag a plug-in after dragging an image, the image would drag again.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView mouseDragged:]): subclass and do nothing to prevent calling mouseDragged in WebHTMLView
+        (-[WebBaseNetscapePluginView performKeyEquivalent:]): no changes to this method, removed menuForEvent, wasn't needed after all
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginStream stop]): minor clean-up
+
 2002-10-20  Darin Adler  <darin at apple.com>
 
 	- fixed a minor problem with autorelease I just ran into
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index c4b0454..3394277 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -243,6 +243,11 @@
     [[NSCursor arrowCursor] set];
 }
 
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+    // Do nothing so that other responders don't respond to the drag that initiated in this view.
+}
+
 - (void)keyUp:(NSEvent *)theEvent
 {
     EventRecord event;
@@ -332,21 +337,6 @@
     return acceptedEvent;
 }
 
-// Must subclass menuForEvent: for right-click to work.
-- (NSMenu *)menuForEvent:(NSEvent *)theEvent
-{
-    EventRecord event;
-    
-    [self getCarbonEvent:&event withEvent:theEvent];
-
-    BOOL acceptedEvent;
-    acceptedEvent = [self sendEvent:&event];
-    
-    LOG(Plugins, "NPP_HandleEvent(menuForEvent): %d pt.v=%d, pt.h=%d", acceptedEvent, event.where.v, event.where.h);
-
-    return nil;
-}
-
 #pragma mark WEB_NETSCAPE_PLUGIN
 
 - (void)setUpWindowAndPort
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 453c0af..d59e5d2 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -73,10 +73,10 @@
     WebController *controller = [view controller];
 
     WebError *cancelError = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
-                                                        inDomain:WebErrorDomainWebFoundation
-                                                        failingURL:nil];
+                                                       inDomain:WebErrorDomainWebFoundation
+                                                     failingURL:nil];
     [controller _receivedError:cancelError
-                forResourceHandle:resource
+             forResourceHandle:resource
                 fromDataSource:[view dataSource]];
 
     [cancelError release];

-- 
WebKit Debian packaging