[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 29b56839e9a4c7175db2762b625f76c74b42b0a9
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 28 17:42:23 2002 +0000

            Fixed selection horkage I introduced with drag
            fix yesterday.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView mouseDragged:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4a96e76..9a2b5e2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-28  Richard Williamson (Home)  <rjw at apple.com>
+
+        Fixed selection horkage I introduced with drag
+        fix yesterday.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-08-27  Richard Williamson (Local)  <rjw at apple.com>
 
         * WebView.subproj/WebHTMLView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4a96e76..9a2b5e2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-28  Richard Williamson (Home)  <rjw at apple.com>
+
+        Fixed selection horkage I introduced with drag
+        fix yesterday.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-08-27  Richard Williamson (Local)  <rjw at apple.com>
 
         * WebView.subproj/WebHTMLView.m:
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index ded9f93..ba9d5ed 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -438,13 +438,13 @@
             NSArray *fileType = [NSArray arrayWithObject:[[_private->draggedURL path] pathExtension]];
             NSRect rect = NSMakeRect(point.x + -16, point.y - 16, 32, 32);
             [self dragPromisedFilesOfTypes: fileType fromRect: rect source: self slideBack: YES event: event];
+            return;
         }
     }
-    else {
-        // Give khtml a crack at the event only if we haven't started
-        // a drag.
-        [[self _bridge] mouseDragged:event];
-    }
+
+    // Give khtml a crack at the event only if we haven't started
+    // a drag.
+    [[self _bridge] mouseDragged:event];
 }
 
 

-- 
WebKit Debian packaging