[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 f410bc10f7a731074af78cb2b8457b451e53dc76
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 26 16:05:29 2004 +0000

            - fixed warning that prevents Deployment build from compiling
    
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::khtmlMousePressEvent):
            Moved use of single-click boolean outside the scope of the "block exceptions" macros.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8fb0aad..47c7655 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2004-05-26  Darin Adler  <darin at apple.com>
+
+        - fixed warning that prevents Deployment build from compiling
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::khtmlMousePressEvent):
+        Moved use of single-click boolean outside the scope of the "block exceptions" macros.
+
 2004-05-25  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed a regression where selections that were created via double or triple were not draggable.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5bc1a6b..f590304 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1670,23 +1670,25 @@ bool KWQKHTMLPart::closeURL()
 
 void KWQKHTMLPart::khtmlMousePressEvent(MousePressEvent *event)
 {
+    bool singleClick = [_currentEvent clickCount] <= 1;
+
     // If we got the event back, that must mean it wasn't prevented,
     // so it's allowed to start a drag or selection.
     _mouseDownMayStartSelect = true;
-
-    bool oneClick = [_currentEvent clickCount] <= 1 ? true : false;
-    _mouseDownMayStartDrag = oneClick;
+    _mouseDownMayStartDrag = singleClick;
 
     if (!passWidgetMouseDownEventToWidget(event)) {
         // We don't do this at the start of mouse down handling (before calling into WebCore),
         // because we don't want to do it until we know we didn't hit a widget.
         NSView *view = d->m_view->getDocumentView();
 
-	KWQ_BLOCK_EXCEPTIONS;
-        if (oneClick && [_bridge firstResponder] != view) {
-            [_bridge makeFirstResponder:view];
+        if (singleClick) {
+            KWQ_BLOCK_EXCEPTIONS;
+            if ([_bridge firstResponder] != view) {
+                [_bridge makeFirstResponder:view];
+            }
+            KWQ_UNBLOCK_EXCEPTIONS;
         }
-	KWQ_UNBLOCK_EXCEPTIONS;
 
         KHTMLPart::khtmlMousePressEvent(event);
     }

-- 
WebKit Debian packaging