Bug 428765 - Use nxIXULAppInfo to get application version number in about:. r=gavin,a=gavin

toolkit/content/Makefile.in

@@ -46,7 +46,6 @@ CHROME_DEPS = buildconfig.html
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += \
-  -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
   -Dtarget="$(target)" \
   -Dac_configure_args="$(ac_configure_args)" \
   -DCC="$(CC)" \

toolkit/content/about.xhtml

@@ -61,7 +61,7 @@
   <div id="aboutLogoContainer">
     <a id="vendorURL" href="http://www.mozilla.org/">
       <img src="about:logo" alt="&brandShortName;"/>
-#expand <p id="version">&about.version; __MOZ_APP_VERSION__</p>
+      <p id="version"></p>
     </a>
   </div>
 
@@ -82,6 +82,12 @@
         var vendorURL = formatter.formatURLPref("app.vendorURL");
         var vendor = document.getElementById("vendorURL");
         vendor.setAttribute("href", vendorURL);
+
+        var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
+                                   .getService(Components.interfaces.nsIXULAppInfo)
+                                   .version;
+        var version = document.getElementById("version");
+        version.appendChild(document.createTextNode("&about.version; " + versionNum));
       }
       catch (ex) { /* no release notes and vendor URL for you without bug 349985 being fixed */ }
 

toolkit/content/jar.mn

@@ -10,7 +10,7 @@ toolkit.jar:
 *  content/global/xul.css                     (xul.css)
    content/global/textbox.css                 (textbox.css)
    content/global/menulist.css                (menulist.css)
-*  content/global/about.xhtml                 (about.xhtml)
+   content/global/about.xhtml                 (about.xhtml)
 *  content/global/aboutAbout.xhtml            (aboutAbout.xhtml)
 *  content/global/aboutRights.xhtml           (aboutRights.xhtml)
 *  content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)