[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 9022aef6b0a9508edb717d9346a7d6e12c28dafe
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 10 00:59:46 2002 +0000

            Implemented  disable images automatically (2896319).
    
            * Preferences.subproj/AppearancePreferences.m:
            (-[AppearancePreferences toggleDisplayImages:]):
            (-[AppearancePreferences initializeFromDefaults]):
    
            Implemented  disable images automatically (2896319).
    
            * WebView.subproj/WebPreferences.h:
            * WebView.subproj/WebPreferences.m:
            (+[WebPreferences load]):
            (-[WebPreferences setDisplayImages:]):
            (-[WebPreferences displayImages]):
    
            Implemented  disable images automatically (2896319).
    
            * kwq/KWQKHTMLSettings.mm:
            (KHTMLSettings::autoLoadImages):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5538617..e109c28 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-09  Richard Williamson (Home)  <rjw at apple.com>
+
+        Implemented  disable images automatically (2896319).
+
+        * kwq/KWQKHTMLSettings.mm:
+        (KHTMLSettings::autoLoadImages):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyView):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5538617..e109c28 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-09-09  Richard Williamson (Home)  <rjw at apple.com>
+
+        Implemented  disable images automatically (2896319).
+
+        * kwq/KWQKHTMLSettings.mm:
+        (KHTMLSettings::autoLoadImages):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyView):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5538617..e109c28 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-09-09  Richard Williamson (Home)  <rjw at apple.com>
+
+        Implemented  disable images automatically (2896319).
+
+        * kwq/KWQKHTMLSettings.mm:
+        (KHTMLSettings::autoLoadImages):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::nextKeyView):
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index 93adc9e..a3854c0 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -114,7 +114,7 @@ bool KHTMLSettings::isJavaEnabled() const
 
 bool KHTMLSettings::autoLoadImages() const
 {
-    return true;
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitDisplayImagesKey"] boolValue];
 }
 
 bool KHTMLSettings::isPluginsEnabled(QString const&) const
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 857d1d5..0a9ba95 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-09  Richard Williamson (Home)  <rjw at apple.com>
+
+        Implemented  disable images automatically (2896319).
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences load]):
+        (-[WebPreferences setDisplayImages:]):
+        (-[WebPreferences displayImages]):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
 	- fixed 3003605 -- Leaking 1 WebView after second run of static PLT
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 857d1d5..0a9ba95 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-09  Richard Williamson (Home)  <rjw at apple.com>
+
+        Implemented  disable images automatically (2896319).
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences load]):
+        (-[WebPreferences setDisplayImages:]):
+        (-[WebPreferences displayImages]):
+
 2002-09-09  Darin Adler  <darin at apple.com>
 
 	- fixed 3003605 -- Leaking 1 WebView after second run of static PLT
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 027ca76..3f8c73a 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -66,6 +66,9 @@
 - (BOOL)allowAnimatedImageLooping;
 - (void)setAllowAnimatedImageLooping: (BOOL)flag;
 
+- (void)setDisplayImages: (BOOL)flag;
+- (BOOL)displayImages;
+
 @end
 
 #ifdef READY_FOR_PRIMETIME
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 61ca29b..2f4c059 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -29,6 +29,7 @@
 #define        WebKitResourceTimedLayoutDelayPreferenceKey        @"WebKitResourceTimedLayoutDelay"
 #define        WebKitAllowAnimatedImagesPreferenceKey        @"WebKitAllowAnimatedImagesPreferenceKey"
 #define        WebKitAllowAnimatedImageLoopingPreferenceKey        @"WebKitAllowAnimatedImageLoopingPreferenceKey"
+#define        WebKitDisplayImagesKey				@"WebKitDisplayImagesKey"
 
 @implementation WebPreferences
 
@@ -48,6 +49,7 @@ static WebPreferences *_standardPreferences = nil;
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
+    NSNumber *displayImages = [NSNumber numberWithBool:TRUE];
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
     NSNumber *userStyleSheetEnabled = [NSNumber numberWithBool:FALSE];
     NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
@@ -84,6 +86,7 @@ static WebPreferences *_standardPreferences = nil;
         pluginsEnabled,                 WebKitPluginsEnabledPreferenceKey,
         allowAnimatedImages,            WebKitAllowAnimatedImagesPreferenceKey,
         allowAnimatedImageLooping,      WebKitAllowAnimatedImageLoopingPreferenceKey,
+        displayImages,			WebKitDisplayImagesKey,
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
@@ -301,5 +304,14 @@ static WebPreferences *_standardPreferences = nil;
 }
 
 
+- (void)setDisplayImages: (BOOL)flag
+{
+    [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitDisplayImagesKey];
+}
+
+- (BOOL)displayImages
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitDisplayImagesKey];
+}
 
 @end

-- 
WebKit Debian packaging