[Pkg-mozext-commits] [firetray] 64/84: Workaround impossibily to require minVersion for a specific targetPlatform.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit be74126c96578d78a570d84339f03873fb3206aa
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sun May 25 21:48:51 2014 +0200

    Workaround impossibily to require minVersion for a specific targetPlatform.
    
    We just check at runtime.
---
 src/install.rdf                 | 4 ++--
 src/modules/FiretrayHandler.jsm | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/install.rdf b/src/install.rdf
index 4a34638..aa87a4c 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -20,7 +20,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
-        <em:minVersion>27.0</em:minVersion>
+        <em:minVersion>7.0</em:minVersion>
         <em:maxVersion>30.0</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -28,7 +28,7 @@
     <em:targetApplication>      <!-- Thunderbird -->
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>27.0</em:minVersion>
+        <em:minVersion>7.0</em:minVersion>
         <em:maxVersion>30.0</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 541e2b1..b69b364 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -68,12 +68,15 @@ firetray.Handler = {
     firetray.PrefListener.register(false);
     firetray.MailChatPrefListener.register(false);
 
-    // version checked during install, so we shouldn't need to care
     log.info("OS=" + this.runtimeOS + ", ABI=" + this.runtimeABI + ", XULrunner=" + this.xulVer);
     if (FIRETRAY_SUPPORTED_OS.indexOf(this.runtimeOS) < 0) {
       let platforms = FIRETRAY_SUPPORTED_OS.join(", ");
       log.error("Only "+platforms+" platform(s) supported at this time. Firetray not loaded");
       return false;
+    } else if (this.runtimeOS == "winnt" &&
+               Services.vc.compare(this.xulVer,"27.0") < 0) {
+      log.error("FireTray needs Gecko 27 and above on Windows.");
+      return false;
     }
     Cu.import("resource://firetray/"+this.runtimeOS+"/FiretrayStatusIcon.jsm");
     log.debug("FiretrayStatusIcon "+this.runtimeOS+" imported");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git