[Navigator] Don't bitch about being old and insecure if there is no update service to be had.

2 years ago · c80bde0659
5 changed files with 13 additions and 7 deletions
--- a/navigator/comm/content/bindings/notification.xml
+++ b/navigator/comm/content/bindings/notification.xml
@ -1203,6 +1203,7 @@
        </body>
      </method>

+#ifdef MOZ_UPDATER
      <method name="showUpdateWarning">
        <body>
          <![CDATA[
@ -1225,6 +1226,7 @@
          ]]>
        </body>
      </method>
+#endif

      <method name="removeNotifications">
        <parameter name="aNotifications"/>
--- a/navigator/comm/jar.mn
+++ b/navigator/comm/jar.mn
@ -47,7 +47,7 @@ comm.jar:

  content/communicator/bindings/findbar.xml                        (content/bindings/findbar.xml)
  content/communicator/bindings/general.xml                        (content/bindings/general.xml)
-  content/communicator/bindings/notification.xml                   (content/bindings/notification.xml)
+* content/communicator/bindings/notification.xml                   (content/bindings/notification.xml)
  content/communicator/bindings/toolbar.xml                        (content/bindings/toolbar.xml)

  content/communicator/labelsencodings.properties                  (/platform/dom/encoding/labelsencodings.properties)
@ -73,7 +73,7 @@ en-US.jar:

  locale/en-US/communicator/gopherAddon.dtd                               (locale/gopherAddon.dtd)
  locale/en-US/communicator/notification.dtd                              (locale/notification.dtd)
-  locale/en-US/communicator/notification.properties                       (locale/notification.properties)
+* locale/en-US/communicator/notification.properties                       (locale/notification.properties)
  locale/en-US/communicator/openLocation.dtd                              (locale/openLocation.dtd)
  locale/en-US/communicator/openLocation.properties                       (locale/openLocation.properties)
  locale/en-US/communicator/passwordManager.dtd                           (locale/passwordManager.dtd)
--- a/navigator/comm/locale/notification.properties
+++ b/navigator/comm/locale/notification.properties
@ -175,11 +175,13 @@ lockPrompt.text=The bookmarks and history system will not be functional because
 lockPromptInfoButton.label=Learn More
 lockPromptInfoButton.accesskey=L

+#ifdef MOZ_UPDATER
 # LOCALIZATION NOTE (updatePrompt.text)
 # %S will be replaced with the application name.
-updatePrompt.text=Your copy of %S is old and probably has known security flaws, but you have disabled automated update checks. Please update to a newer version.
+updatePrompt.text=Your copy of %S is likely old and insecure, but you have disabled automated update checks. Please update to a newer version.
 updatePromptCheckButton.label=Check for Updates
 updatePromptCheckButton.accesskey=C
+#endif

 SecurityTitle=Security Warning
 MixedContentMessage=You have requested an encrypted page that contains some unencrypted information. Information that you see or enter on this page could easily be read by a third party.
--- a/navigator/components/moz.build
+++ b/navigator/components/moz.build
@ -21,9 +21,7 @@ DIRS += [
    'smile',
 ]

-XPIDL_SOURCES += [
-    'nsINavigatorGlue.idl',
-]
+XPIDL_SOURCES += ['nsINavigatorGlue.idl']

 XPIDL_MODULE = 'navigatorcompsbase'

@ -32,6 +30,7 @@ EXTRA_COMPONENTS += [
    'nsAboutRedirector.js',
    'nsBrowserContentHandler.js',
    'nsGopherProtocolStubHandler.js',
-    'nsNavigatorGlue.js',
    'nsTypeAheadFind.js',
 ]
+
+EXTRA_PP_COMPONENTS += ['nsNavigatorGlue.js']
--- a/navigator/components/nsNavigatorGlue.js
+++ b/navigator/components/nsNavigatorGlue.js
@ -563,6 +563,7 @@ NavigatorGlue.prototype = {
    // Detect if updates are off and warn for outdated builds.
    if (this._shouldShowUpdateWarning())
      notifyBox.showUpdateWarning();
+#endif

    this._checkForDefaultClient(aWindow);
  },
@ -785,6 +786,7 @@ NavigatorGlue.prototype = {
    return true;
  },

+#ifdef MOZ_UPDATER
  /*
   * _shouldShowUpdateWarning - Determines if the user should be warned about
   * having updates off and an old build that likely should be updated.
@ -816,6 +818,7 @@ NavigatorGlue.prototype = {
    // We should warn if the build is older than the max age.
    return (buildTime + maxAge <= now);
  },
+#endif

  // This method gets the shell service and has it check its settings.
  // This will do nothing on platforms without a shell service.