[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 834fc039c920efef1bc12647ffa4da57cabbd98d
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 14 20:39:56 2004 +0000

    WebKit:
    
            - changed stealth mode preference name from "historyIsFrozen"
            to "privateBrowsingEnabled"
    
            Reviewed by Darin.
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _transitionToCommitted:]):
            updated for method name change
    
            * WebView.subproj/WebPreferences.m:
            changed preference key name
            (+[WebPreferences initialize]):
            updated for preference key name change
            (-[WebPreferences setPrivateBrowsingEnabled:]):
            changed name from setHistoryIsFrozen:
            (-[WebPreferences privateBrowsingEnabled]):
            changed name from historyIsFrozen:
    
            * WebView.subproj/WebPreferencesPrivate.h:
            changed declared method names
    
            * English.lproj/StringsNotToBeLocalized.txt:
            updated for this and other recent changes
    
    WebBrowser:
    
            fixed these bugs:
            <rdar://problem/3622190>: stealth mode menu item should be "Start Private Browsing�Stop Private Browsing"
            <rdar://problem/3622479>: Reword Private Browsing confirmation to use Ron's edited wording
            <rdar://problem/3622496>: stealth mode should automatically turn off between sessions
    
            Also, updated for WebKit stealth mode preference name change
    
            Reviewed by Darin.
    
            * AppController.m:
            (-[AppController applicationDidFinishLaunching:]):
            always turn off stealth mode on launch (previously did this only on Panther)
            (-[AppController confirmEnableStealthMode]):
            reworded confirmation title and message; also updated for preference name change
            (-[AppController toggleStealthMode:]):
            updated for preference name change
            (-[AppController validateUserInterfaceItem:]):
            use "Start/Stop" instead of checkmark to distinguish states; also updated for
            preference name change
    
            * BrowserWindowController.m:
            (-[BrowserWindowController searchField:shouldRememberSearchString:]):
            updated for preference name change
    
            * DownloadProgressEntry.m:
            (-[DownloadProgressEntry setDownloadStage:]):
            updated for preference name change
    
            * English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
            updated for these changes
    
            * English.lproj/MainMenu.nib:
            changed menu item in the nib to "Start Private Browsing�, though this
            doesn't really matter since the toggling menu item title comes from the code now.
    
            * FormCompletionController.m:
            (+[FormCompletionController shouldSaveFormData]):
            updated for preference name change
            (+[FormCompletionController shouldSaveUsernamesAndPasswords]):
            ditto
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 30e40d9..e785c6c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,29 @@
+2004-04-14  John Sullivan  <sullivan at apple.com>
+
+        - changed stealth mode preference name from "historyIsFrozen"
+        to "privateBrowsingEnabled"
+
+        Reviewed by Darin.
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _transitionToCommitted:]):
+        updated for method name change
+        
+        * WebView.subproj/WebPreferences.m:
+        changed preference key name
+        (+[WebPreferences initialize]):
+        updated for preference key name change
+        (-[WebPreferences setPrivateBrowsingEnabled:]):
+        changed name from setHistoryIsFrozen:
+        (-[WebPreferences privateBrowsingEnabled]):
+        changed name from historyIsFrozen:
+        
+        * WebView.subproj/WebPreferencesPrivate.h:
+        changed declared method names
+
+        * English.lproj/StringsNotToBeLocalized.txt:
+        updated for this and other recent changes
+
 2004-04-13  Chris Blumenberg  <cblu at apple.com>
 
 	- Added WebElementDOMNodeKey as a potential API so that clients can get the node from an element dictionary.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index a527ea6..164855f 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -132,12 +132,12 @@
 "WebBackForwardList:\n"
 "WebCurrentFrameState"
 "WebDataRequest"
+"WebElementDOMNode"
 "WebElementFrame"
 "WebElementImage"
 "WebElementImageAltString"
 "WebElementImageRect"
 "WebElementImageURL"
-"WebElementIsEditable"
 "WebElementIsSelected"
 "WebElementLinkLabel"
 "WebElementLinkTitle"
@@ -180,7 +180,6 @@
 "WebKitFantasyFont"
 "WebKitFixedFont"
 "WebKitHistoryAgeInDaysLimit"
-"WebKitHistoryIsFrozen"
 "WebKitHistoryItemLimit"
 "WebKitInitialTimedLayoutDelay"
 "WebKitInitialTimedLayoutEnabled"
@@ -194,6 +193,7 @@
 "WebKitObjectCacheSizePreferenceKey"
 "WebKitPageCacheSizePreferenceKey"
 "WebKitPluginsEnabled"
+"WebKitPrivateBrowsingEnabled"
 "WebKitResourceTimedLayoutDelay"
 "WebKitResourceTimedLayoutEnabled"
 "WebKitSansSerifFont"
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 64ec3ec..b7e3684 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -785,7 +785,7 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
                     // Add item to history and BF list
                     NSURL *URL = [ds _URLForHistory];
                     if (URL && ![URL _web_isEmpty]){
-                        if (![[WebPreferences standardPreferences] historyIsFrozen]) {
+                        if (![[WebPreferences standardPreferences] privateBrowsingEnabled]) {
                             entry = [[WebHistory optionalSharedHistory] addItemForURL:URL];
                             if (ptitle)
                                 [entry setTitle: ptitle];                            
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 249903a..47fcb73 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -46,7 +46,7 @@
 #define WebKitObjectCacheSizePreferenceKey @"WebKitObjectCacheSizePreferenceKey"
 #define WebKitBackForwardCacheExpirationIntervalKey @"WebKitBackForwardCacheExpirationIntervalKey"
 #define WebKitTabToLinksPreferenceKey @"WebKitTabToLinksPreferenceKey"
-#define WebKitHistoryIsFrozenPreferenceKey @"WebKitHistoryIsFrozen"
+#define WebKitPrivateBrowsingEnabledPreferenceKey @"WebKitPrivateBrowsingEnabled"
 
 NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotification";
 
@@ -235,7 +235,7 @@ NS_ENDHANDLER
         [NSNumber numberWithBool:YES],  WebKitDisplayImagesKey,
         @"1800",                        WebKitBackForwardCacheExpirationIntervalKey,
         [NSNumber numberWithBool:NO],   WebKitTabToLinksPreferenceKey,
-        [NSNumber numberWithBool:NO],   WebKitHistoryIsFrozenPreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitPrivateBrowsingEnabledPreferenceKey,
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
@@ -610,14 +610,14 @@ NS_ENDHANDLER
     return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTabToLinksPreferenceKey];
 }
 
-- (void)setHistoryIsFrozen:(BOOL)flag
+- (void)setPrivateBrowsingEnabled:(BOOL)flag
 {
-    [self _setBoolValue:flag forKey:WebKitHistoryIsFrozenPreferenceKey];
+    [self _setBoolValue:flag forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
 }
 
-- (BOOL)historyIsFrozen
+- (BOOL)privateBrowsingEnabled
 {
-    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitHistoryIsFrozenPreferenceKey];
+    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitPrivateBrowsingEnabledPreferenceKey];
 }
 
 static NSMutableDictionary *webPreferencesInstances = nil;
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index 3876c1e..2d3d2a4 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -22,8 +22,8 @@
 
 + (void)_setIBCreatorID:(NSString *)string;
 
-- (void)setHistoryIsFrozen:(BOOL)newValue;
-- (BOOL)historyIsFrozen;
+- (void)setPrivateBrowsingEnabled:(BOOL)newValue;
+- (BOOL)privateBrowsingEnabled;
 
 - (void)setTabsToLinks:(BOOL)flag;
 - (BOOL)tabsToLinks;

-- 
WebKit Debian packaging