From a2d1a77df252d261dfa78b123dde5bb3986030e5 Mon Sep 17 00:00:00 2001 From: "blakeross%telocity.com" Date: Sun, 14 Oct 2001 01:56:05 +0000 Subject: [PATCH] Remove nsTimeBomb, stop doing unnecessary timebomb work (57306). r=mcafee sr=ben git-svn-id: svn://10.0.0.236/trunk@105380 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mac/build_scripts/MozillaBuildList.pm | 3 --- .../xpfe/browser/src/nsBrowserInstance.cpp | 27 ------------------- .../resources/locale/en-US/region.dtd | 2 -- mozilla/xpfe/components/Makefile.in | 2 +- mozilla/xpfe/components/build/Makefile.in | 2 -- mozilla/xpfe/components/build/makefile.win | 2 -- mozilla/xpfe/components/build/nsModule.cpp | 3 --- mozilla/xpfe/components/console/makefile.win | 2 -- mozilla/xpfe/components/jar.mn | 4 --- mozilla/xpfe/components/makefile.win | 1 - 10 files changed, 1 insertion(+), 47 deletions(-) diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm index 74cd6784940..b9a852ac6c6 100644 --- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm +++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm @@ -817,9 +817,6 @@ sub BuildClientDist() InstallFromManifest(":mozilla:xpfe:components:$dir:public:MANIFEST_IDL", "$distdirectory:idl:"); } - InstallFromManifest(":mozilla:xpfe:components:timebomb:MANIFEST", "$distdirectory:xpfe:"); - InstallFromManifest(":mozilla:xpfe:components:timebomb:MANIFEST_IDL", "$distdirectory:idl:"); - # directory InstallFromManifest(":mozilla:xpfe:components:directory:MANIFEST_IDL", "$distdirectory:idl:"); # regviewer diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index 6223929dd33..f94532e686c 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -154,14 +154,11 @@ static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); #define ENABLE_PAGE_CYCLER #endif -#include "nsTimeBomb.h" - /* Define Class IDs */ static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); static NS_DEFINE_IID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); static NS_DEFINE_IID(kCGlobalHistoryCID, NS_GLOBALHISTORY_CID); static NS_DEFINE_CID(kCPrefServiceCID, NS_PREF_CID); -static NS_DEFINE_CID(kTimeBombCID, NS_TIMEBOMB_CID); static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); @@ -923,32 +920,8 @@ NS_IMETHODIMP nsBrowserContentHandler::GetDefaultArgs(PRUnichar **aDefaultArgs) return NS_ERROR_NULL_POINTER; nsresult rv; - static PRBool timebombChecked = PR_FALSE; nsAutoString args; - if (!timebombChecked) { - // timebomb check - timebombChecked = PR_TRUE; - - PRBool expired; - nsCOMPtr timeBomb(do_GetService(kTimeBombCID, &rv)); - if (NS_FAILED(rv)) return rv; - - rv = timeBomb->Init(); - if (NS_FAILED(rv)) return rv; - - rv = timeBomb->CheckWithUI(&expired); - if (NS_FAILED(rv)) return rv; - - if (expired) { - nsXPIDLCString urlString; - rv = timeBomb->GetTimebombURL(getter_Copies(urlString)); - if (NS_FAILED(rv)) return rv; - - args.AssignWithConversion(urlString); - } - } - if (args.IsEmpty()) { nsCOMPtr prefs(do_GetService(kCPrefServiceCID)); if (!prefs) return NS_ERROR_FAILURE; diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/region.dtd b/mozilla/xpfe/communicator/resources/locale/en-US/region.dtd index 3256790c2d9..e69de29bb2d 100644 --- a/mozilla/xpfe/communicator/resources/locale/en-US/region.dtd +++ b/mozilla/xpfe/communicator/resources/locale/en-US/region.dtd @@ -1,2 +0,0 @@ - - diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in index 15285438296..f166d33ece8 100644 --- a/mozilla/xpfe/components/Makefile.in +++ b/mozilla/xpfe/components/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public bookmarks directory filepicker find history search sidebar related regviewer xfer prefwindow shistory remote timebomb console autocomplete urlbarhistory intl build +DIRS = public bookmarks directory filepicker find history search sidebar related regviewer xfer prefwindow shistory remote console autocomplete urlbarhistory intl build ifdef MOZ_ENABLE_XREMOTE DIRS += xremote diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in index 3607732d6ce..a66e8d70d08 100644 --- a/mozilla/xpfe/components/build/Makefile.in +++ b/mozilla/xpfe/components/build/Makefile.in @@ -64,7 +64,6 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libappcompintl_s.$(LIB_SUFFIX) \ $(DIST)/lib/librelated_s.$(LIB_SUFFIX) \ $(DIST)/lib/libsearch_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libtimebomb_s.$(LIB_SUFFIX) \ $(DIST)/lib/liburlbarhistory_s.$(LIB_SUFFIX) \ $(NULL) @@ -79,7 +78,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../history/src \ -I$(srcdir)/../related/src \ -I$(srcdir)/../search/src \ - -I$(srcdir)/../timebomb \ -I$(srcdir)/../urlbarhistory/src \ $(NULL) diff --git a/mozilla/xpfe/components/build/makefile.win b/mozilla/xpfe/components/build/makefile.win index da297bacfb6..723a496f4f9 100644 --- a/mozilla/xpfe/components/build/makefile.win +++ b/mozilla/xpfe/components/build/makefile.win @@ -66,7 +66,6 @@ SUB_LIBRARIES= \ $(DIST)\lib\appcompintl_s.lib \ $(DIST)\lib\related_s.lib \ $(DIST)\lib\search_s.lib \ - $(DIST)\lib\timebomb_s.lib \ $(DIST)\lib\urlbarhistory_s.lib \ $(DIST)\lib\urlwidgt_s.lib \ $(DIST)\lib\winhooks_s.lib \ @@ -90,7 +89,6 @@ INCS = $(INCS) \ -I$(DEPTH)\xpfe\components\history\src \ -I$(DEPTH)\xpfe\components\related\src \ -I$(DEPTH)\xpfe\components\search\src \ - -I$(DEPTH)\xpfe\components\timebomb \ -I$(DEPTH)\xpfe\components\urlbarhistory\src \ -I$(DEPTH)\xpfe\components\urlwidget \ -I$(DEPTH)\xpfe\components\winhooks \ diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp index bad81ed04c3..feaed08a6d0 100644 --- a/mozilla/xpfe/components/build/nsModule.cpp +++ b/mozilla/xpfe/components/build/nsModule.cpp @@ -44,7 +44,6 @@ #include "nsLocalSearchService.h" #include "nsInternetSearchService.h" #include "nsRelatedLinksHandlerImpl.h" -#include "nsTimeBomb.h" #include "nsUrlbarHistory.h" #include "nsXPIDLString.h" #include "nsCharsetMenu.h" @@ -67,7 +66,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(RelatedLinksHandlerImpl, Init) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimeBomb) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageHandler) #if defined(XP_WIN) @@ -163,7 +161,6 @@ static nsModuleComponentInfo components[] = { NS_INTERNETSEARCH_DATASOURCE_CONTRACTID, InternetSearchDataSourceConstructor }, { "Related Links Handler", NS_RELATEDLINKSHANDLER_CID, NS_RELATEDLINKSHANDLER_CONTRACTID, RelatedLinksHandlerImplConstructor}, - { "Netscape TimeBomb", NS_TIMEBOMB_CID, NS_TIMEBOMB_CONTRACTID, nsTimeBombConstructor}, { "nsUrlbarHistory", NS_URLBARHISTORY_CID, NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor }, { "nsUrlbarHistory", NS_URLBARHISTORY_CID, diff --git a/mozilla/xpfe/components/console/makefile.win b/mozilla/xpfe/components/console/makefile.win index ecbed046f0d..b5c5af1c3dd 100644 --- a/mozilla/xpfe/components/console/makefile.win +++ b/mozilla/xpfe/components/console/makefile.win @@ -19,8 +19,6 @@ # # Contributor(s): -# copied in part from ../timebomb/makefile.win - DEPTH = ..\..\.. include <$(DEPTH)/config/config.mak> diff --git a/mozilla/xpfe/components/jar.mn b/mozilla/xpfe/components/jar.mn index 009f8b133bc..ef7c6e90559 100644 --- a/mozilla/xpfe/components/jar.mn +++ b/mozilla/xpfe/components/jar.mn @@ -92,9 +92,6 @@ comm.jar: content/communicator/sidebar/sidebarOverlay.xul (sidebar/resources/sidebarOverlay.xul) content/communicator/sidebar/PageNotFound.xul (sidebar/resources/PageNotFound.xul) content/communicator/sidebar/local-panels.rdf (sidebar/resources/local-panels.rdf) - content/communicator/timebomb/warn.xul (timebomb/resources/content/warn.xul) - content/communicator/timebomb/expireText.xul (timebomb/resources/content/expireText.xul) - en-US.jar: locale/en-US/communicator/directory/directory.dtd (directory/locale/en-US/directory.dtd) locale/en-US/communicator/history/history.dtd (history/resources/locale/en-US/history.dtd) @@ -148,7 +145,6 @@ en-US.jar: locale/en-US/communicator/sidebar/local-panels.dtd (sidebar/resources/locale/en-US/local-panels.dtd) locale/en-US/communicator/sidebar/sidebarOverlay.dtd (sidebar/resources/locale/en-US/sidebarOverlay.dtd) locale/en-US/communicator/sidebar/sidebar.properties (sidebar/resources/locale/en-US/sidebar.properties) - locale/en-US/communicator/timebomb/timebomb.dtd (timebomb/resources/locale/en-US/timebomb.dtd) locale/en-US/global/downloadProgress.dtd (xfer/resources/locale/en-US/downloadProgress.dtd) locale/en-US/global/downloadProgress.properties (xfer/resources/locale/en-US/downloadProgress.properties) locale/en-US/global/filepicker.dtd (filepicker/res/locale/en-US/filepicker.dtd) diff --git a/mozilla/xpfe/components/makefile.win b/mozilla/xpfe/components/makefile.win index f25465710c2..c94a9bf4a54 100644 --- a/mozilla/xpfe/components/makefile.win +++ b/mozilla/xpfe/components/makefile.win @@ -35,7 +35,6 @@ DIRS= \ related \ xfer \ shistory \ - timebomb \ console \ autocomplete \ urlbarhistory \