Bug 1389786 - Export Screenshots 10.12.0 to Firefox. r=kmag, a=jcristau
authorJared Hirsch <ohai@6a68.net>
Sat, 12 Aug 2017 12:52:48 -0700
changeset 666709 c429763f95c373ffebb233b51c6d1ab9ad1d89cc
parent 666708 068afb8b903d65bfb4e2fcdc7455cf46052f1f8d
child 666710 3feb092c607a8203ab1506af26415ca42bfb491f
push id80488
push userbmo:mkelly@mozilla.com
push dateTue, 19 Sep 2017 04:42:30 +0000
reviewerskmag, jcristau
bugs1389786
milestone55.0.3
Bug 1389786 - Export Screenshots 10.12.0 to Firefox. r=kmag, a=jcristau MozReview-Commit-ID: 1c6rq32TmOf
browser/extensions/screenshots/bootstrap.js
browser/extensions/screenshots/install.rdf
browser/extensions/screenshots/webextension/manifest.json
--- a/browser/extensions/screenshots/bootstrap.js
+++ b/browser/extensions/screenshots/bootstrap.js
@@ -76,16 +76,21 @@ function startup(data, reason) { // esli
 }
 
 function shutdown(data, reason) { // eslint-disable-line no-unused-vars
   prefObserver.unregister();
   const webExtension = LegacyExtensionsUtils.getEmbeddedExtensionFor({
     id: ADDON_ID,
     resourceURI: addonResourceURI
   });
+  // Immediately exit if Firefox is exiting, #3323
+  if (reason === APP_SHUTDOWN) {
+    stop(webExtension, reason);
+    return;
+  }
   // Because the prefObserver is unregistered above, this _should_ terminate the promise chain.
   appStartupPromise = appStartupPromise.then(() => { stop(webExtension, reason); });
 }
 
 function install(data, reason) {} // eslint-disable-line no-unused-vars
 
 function uninstall(data, reason) {} // eslint-disable-line no-unused-vars
 
--- a/browser/extensions/screenshots/install.rdf
+++ b/browser/extensions/screenshots/install.rdf
@@ -7,14 +7,14 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!--Firefox-->
         <em:minVersion>51.0a1</em:minVersion>
         <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:type>2</em:type>
-    <em:version>10.11.0</em:version>
+    <em:version>10.12.0</em:version>
     <em:bootstrap>true</em:bootstrap>
     <em:homepageURL>https://pageshot.net/</em:homepageURL>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
   </Description>
 </RDF>
--- a/browser/extensions/screenshots/webextension/manifest.json
+++ b/browser/extensions/screenshots/webextension/manifest.json
@@ -1,12 +1,12 @@
 {
   "manifest_version": 2,
   "name": "Firefox Screenshots",
-  "version": "10.11.0",
+  "version": "10.12.0",
   "description": "__MSG_addonDescription__",
   "author": "__MSG_addonAuthorsList__",
   "homepage_url": "https://github.com/mozilla-services/screenshots",
   "applications": {
     "gecko": {
       "id": "screenshots@mozilla.org"
     }
   },