From d5cb5a66d287b00a1ece1e162650faf987c41c72 Mon Sep 17 00:00:00 2001 From: "smfr%smfr.org" Date: Mon, 14 Nov 2005 05:31:36 +0000 Subject: [PATCH] Fix bug 315886 and bug 295774: add warning sheets when clearing the cache and history in the prefs, and standardize the terminology. Patches based on changes by Smokey Ardisson and Chris Lawson. git-svn-id: svn://10.0.0.236/trunk@184567 18797224-902f-48f8-a5cc-f745e15eee43 --- .../English.lproj/History.nib/info.nib | 6 +- .../History.nib/keyedobjects.nib | Bin 5863 -> 6849 bytes .../History/English.lproj/Localizable.strings | Bin 74 -> 1402 bytes .../camino/PreferencePanes/History/History.mm | 57 +++++++++++++++++- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib index 01ceb58eeb6..b5cdf0822fb 100644 --- a/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib +++ b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/info.nib @@ -3,10 +3,10 @@ IBDocumentLocation - 111 35 522 320 0 0 1920 1178 + 68 33 522 320 0 0 1600 1002 IBFramework Version - 364.0 + 437.0 IBSystem Version - 7W98 + 8F46 diff --git a/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/History/English.lproj/History.nib/keyedobjects.nib index 3bf429c1f9dccde607aa97edeb3757b6ef93ce16..081794669c69d11c507b5aa8576a80645e532e1f 100644 GIT binary patch literal 6849 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 H-R*w|(N5sg literal 5863 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 cacheServ ( do_GetService("@mozilla.org/network/cache-service;1") ); if ( cacheServ ) cacheServ->EvictEntries(nsICache::STORE_ANYWHERE); } -// use the browser history service to clear out the user's global history -- (IBAction)clearGlobalHistory:(id)sender +- (void)doClearGlobalHistory { nsCOMPtr hist ( do_GetService("@mozilla.org/browser/global-history;2") ); if ( hist )