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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit ff98a8e509361967b89c082eed6cd5902bb76115
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 2 19:48:00 2004 +0000

    WebKit:
    
            Reviewed by Dave.
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences historyIsFrozen]):
            take out OMIT_TIGER_FEATURES ifdeffing, since if we turn this into API
            then we'll probably want it to work in Panther also. To protect Safari users,
            Safari now explicitly sets historyIsFrozen to NO when starting up in Panther.
    
            * English.lproj/StringsNotToBeLocalized.txt:
            updated for recent changes
    
    WebBrowser:
    
            - made enough improvements to "Stealth Browsing" to consider this bug fixed:
            <rdar://problem/3184383>: Would like ability to do "stealth browsing" without
            leaving any tracks behind (history, etc.)
    
            Reviewed by Dave.
    
            * AppController.m:
            (-[AppController applicationDidFinishLaunching:]):
            call [WebPreferences historyIsFrozen:NO] on Panther so command-line settings of
            this preference won't persist
            (-[AppController confirmEnableStealthMode]):
            new method, puts up a confirmation dialog explaining what stealth mode is, and
            turns stealth mode on if confirmed. I sent mail to Steve Lemay and Ron Brannan
            to discuss the wording of the dialog, among other things.
            (-[AppController toggleStealthMode:]):
            now calls confirmEnableStealthMode when stealth mode is being turned on
    
            * DownloadProgressEntry.m:
            (-[DownloadProgressEntry setDownloadStage:]):
            always remove successful downloads when they finish when in stealth mode
    
            * English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
            udpated for these changes
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 29f29c3..e2b32a6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-04-02  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Dave.
+        
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences historyIsFrozen]):
+        take out OMIT_TIGER_FEATURES ifdeffing, since if we turn this into API
+        then we'll probably want it to work in Panther also. To protect Safari users,
+        Safari now explicitly sets historyIsFrozen to NO when starting up in Panther.
+
+        * English.lproj/StringsNotToBeLocalized.txt:
+        updated for recent changes
+
 2004-04-02  Chris Blumenberg  <cblu at apple.com>
 
 	Moved the DOM extensions to their own headers
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index b25b197..6bc01ec 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -176,6 +176,7 @@
 "WebKitFantasyFont"
 "WebKitFixedFont"
 "WebKitHistoryAgeInDaysLimit"
+"WebKitHistoryIsFrozen"
 "WebKitHistoryItemLimit"
 "WebKitInitialTimedLayoutDelay"
 "WebKitInitialTimedLayoutEnabled"
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 41f8616..249903a 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -52,10 +52,6 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
 
 #define KEY(x) [(_private->identifier?_private->identifier:@"") stringByAppendingString:x]
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
-#define OMIT_TIGER_FEATURES
-#endif
-
 enum { WebPreferencesVersion = 1 };
 
 @interface WebPreferencesPrivate : NSObject
@@ -621,11 +617,7 @@ NS_ENDHANDLER
 
 - (BOOL)historyIsFrozen
 {
-#ifdef OMIT_TIGER_FEATURES
-    return NO;
-#else
     return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitHistoryIsFrozenPreferenceKey];
-#endif
 }
 
 static NSMutableDictionary *webPreferencesInstances = nil;

-- 
WebKit Debian packaging