[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 0f4f8a83fc1e4c5e1cce6b7aa78cb0f40a0ca1bf
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 14 03:30:06 2002 +0000

            Fixed 3050636.  90% solution.  The "Display Images Automatically"
            preference will be used to disallow image draggging.  So if this
            is set after pages have loaded, their images will not be draggable,
            and vice-versa.  Not disastrous as dragging in either case has little
            or no negative consequences.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView mouseDragged:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 48ae297..d0bd56d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
+
+        Fixed 3050636.  90% solution.  The "Display Images Automatically"
+        preference will be used to disallow image draggging.  So if this
+        is set after pages have loaded, their images will not be draggable,
+        and vice-versa.  Not disastrous as dragging in either case has little
+        or no negative consequences.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-09-13  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit changes for:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 48ae297..d0bd56d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
+
+        Fixed 3050636.  90% solution.  The "Display Images Automatically"
+        preference will be used to disallow image draggging.  So if this
+        is set after pages have loaded, their images will not be draggable,
+        and vice-versa.  Not disastrous as dragging in either case has little
+        or no negative consequences.
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+
 2002-09-13  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit changes for:
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 06bbf92..2f9f91a 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -17,11 +17,12 @@
 #import <WebKit/WebIconLoader.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebPreferences.h>
 #import <WebKit/WebStringTruncator.h>
 #import <WebKit/WebTextRenderer.h>
 #import <WebKit/WebTextRendererFactory.h>
-#import <WebKit/WebViewPrivate.h>
 #import <WebKit/WebURLsWithTitles.h>
+#import <WebKit/WebViewPrivate.h>
 
 // Needed for the mouse moved notification.
 #import <AppKit/NSResponder_Private.h>
@@ -440,7 +441,8 @@
     NSURL *imageURL = [element objectForKey: WebContextMenuElementImageURLKey];
     
     if ((deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis) && !didScroll){
-        if(imageURL || linkURL){
+        if((imageURL && [[WebPreferences standardPreferences] willLoadImagesAutomatically]) ||
+            (!imageURL && linkURL)){
             [_private->draggedURL release];
             
             if (imageURL){

-- 
WebKit Debian packaging