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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 41986b365fa24a807bd5675cd016938773570c70
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 13 02:04:48 2003 +0000

    	Fixed 3475082.  Remove unnecessary orderKey before showKey.
    
    	Written by Ed Voas.
    
            Reviewed by Richard.
    
            * Carbon.subproj/CarbonWindowAdapter.m:
            (-[CarbonWindowAdapter makeKeyWindow]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index e9997a1..41a1ce9 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -623,7 +623,6 @@ extern const OSType NSCarbonWindowPropertyTag;
 	[NSApp _setMouseActivationInProgress:NO];
 	[NSApp setIsActive:YES];
 	[super makeKeyWindow];
-	_NXOrderKeyAndMain();
 	_NXShowKeyAndMain();
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bb672c9..4930b00 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-11-12  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3475082.  Remove unnecessary orderKey before showKey.
+
+	Written by Ed Voas.
+
+        Reviewed by Richard.
+
+        * Carbon.subproj/CarbonWindowAdapter.m:
+        (-[CarbonWindowAdapter makeKeyWindow]):
+
 2003-11-12  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3482147>: replace _releaseFutureIconForURL assertion with a log statement

-- 
WebKit Debian packaging