[tor-commits] [torbirdy/master] Bump minimum supported version to Thunderbird 10.0

[sukhbir at torproject.org]

commit 9298d23bd482ee6a2e2b3bd90765937e1e428745
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Aug 28 17:39:18 2013 -0400

    Bump minimum supported version to Thunderbird 10.0
    
    We no longer support Thunderbird 3.0; the minimum version that is
    supported now is 10.0 up to 23.0, so we no longer need to take care of
    backward compatibility. For more information, see ticket #9569.
---
 components/torbirdy.js |   49 ++++++------------------------------------------
 install.rdf            |    2 +-
 2 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 1bb487f..c1da834 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -1,4 +1,5 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/AddonManager.jsm");
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
@@ -308,33 +309,12 @@ function TorBirdy() {
   this.acctMgr = Cc["@mozilla.org/messenger/account-manager;1"]
                   .getService(Ci.nsIMsgAccountManager);
 
-  var observerService = Cc["@mozilla.org/observer-service;1"]
-                           .getService(Ci.nsIObserverService);
-  observerService.addObserver(this, "quit-application-granted", false);
-
-  var appInfo = Cc["@mozilla.org/xre/app-info;1"]
-                   .getService(Ci.nsIXULAppInfo);
-  var versionChecker = Cc["@mozilla.org/xpcom/version-comparator;1"]
-                          .getService(Ci.nsIVersionComparator);
-
   var pluginsHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
   this.plugins = pluginsHost.getPluginTags({});
 
-  if (versionChecker.compare(appInfo.version, "5.0") >= 0) {
-    this.is_tb5 = true;
-  }
-  else {
-    this.is_tb5 = false;
-  }
-
-  if (this.is_tb5) {
-    Components.utils.import("resource://gre/modules/AddonManager.jsm");
-    this.onEnabling = this.onOperationCancelled;
-    this.onDisabling = this.onUninstalling;
-    AddonManager.addAddonListener(this);
-  } else {
-    observerService.addObserver(this, "em-action-requested", false);
-  }
+  this.onEnabling = this.onOperationCancelled;
+  this.onDisabling = this.onUninstalling;
+  AddonManager.addAddonListener(this);
 
   this.setAccountPrefs();
   this.setPrefs();
@@ -371,21 +351,7 @@ TorBirdy.prototype = {
   },
 
   observe: function(subject, topic, data) {
-    if (topic == "em-action-requested") {
-      subject.QueryInterface(Ci.nsIUpdateItem);
-
-      if (subject.id == TB_ID) {
-        if (data == "item-uninstalled" || data == "item-disabled") {
-          dump("Nooo! TorBirdy uninstall requested\n");
-          this._uninstall = true;
-          this.resetUserPrefs();
-        } else if (data == "item-cancel-action") {
-          dump("Uninstall requested cancelled. Yayay!\n");
-          this._uninstall = false;
-          this.setPrefs();
-        }
-      }
-    }
+    return;
   },
 
   resetUserPrefs: function() {
@@ -559,7 +525,4 @@ TorBirdy.prototype = {
 
 }
 
-if (XPCOMUtils.generateNSGetFactory)
-  var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);
-else
-  var NSGetModule = XPCOMUtils.generateNSGetModule([TorBirdy]);
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);
diff --git a/install.rdf b/install.rdf
index 8a65eb2..150458f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -12,7 +12,7 @@
     <!-- Thunderbird -->
     <Description>
       <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-      <em:minVersion>3.0</em:minVersion>
+      <em:minVersion>10.0</em:minVersion>
       <em:maxVersion>23.*</em:maxVersion>
     </Description>
     </em:targetApplication>