[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 b049f581ee20fadf6cff7567827fcb0fed06b061
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 7 03:29:36 2002 +0000

    	- fixed 2970516 -- Activate Events don't appear to be coming in to the
    	Java Applet.plugin correctly.
    
            * Plugins.subproj/WebPluginView.m: (-[WebPluginView sendActivateEvent:]):
    	Use activeFlag to set modifiers, not activMask, which is an event mask.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 868c904..9920fe9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-06  Darin Adler  <darin at apple.com>
+
+	- fixed 2970516 -- Activate Events don't appear to be coming in to the
+	Java Applet.plugin correctly.
+
+        * Plugins.subproj/WebPluginView.m: (-[WebPluginView sendActivateEvent:]):
+	Use activeFlag to set modifiers, not activMask, which is an event mask.
+
 2002-08-06  John Sullivan  <sullivan at apple.com>
 
 	Add mechanism to store userStyleSheet preferences in WebKit in
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 868c904..9920fe9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-06  Darin Adler  <darin at apple.com>
+
+	- fixed 2970516 -- Activate Events don't appear to be coming in to the
+	Java Applet.plugin correctly.
+
+        * Plugins.subproj/WebPluginView.m: (-[WebPluginView sendActivateEvent:]):
+	Use activeFlag to set modifiers, not activMask, which is an event mask.
+
 2002-08-06  John Sullivan  <sullivan at apple.com>
 
 	Add mechanism to store userStyleSheet preferences in WebKit in
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index b0e7ac1..0796135 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -120,7 +120,7 @@
     WindowRef windowRef = [[self window] _windowRef];
     event.message = (UInt32)windowRef;
     if (activate)
-        event.modifiers |= activMask;
+        event.modifiers |= activeFlag;
     
     acceptedEvent = NPP_HandleEvent(instance, &event); 
     

-- 
WebKit Debian packaging