Merge lp:~kartoch/libnotify-mozilla/simple-support-tbird6 into lp:libnotify-mozilla/0.1

[Kartoch]

- changing maximal version of thunderbird to 6.*
- Use Thunderbird5's AddonManager to find python script (merge from ~svilen-kanev/libnotify-mozilla/tbird5)
- Explicitly unpack .xpi file (merge from ~svilen-kanev/libnotify-mozilla/tbird5)

[Kartoch (kartoch)]

Also solve bug #802982

[lp:~kartoch/libnotify-mozilla/simple-support-tbird6]

60. By Kartoch on 2011-10-10

Moving version to 7.*

Unmerged revisions

60. By Kartoch on 2011-10-10

Moving version to 7.*

59. By Kartoch on 2011-09-23

merging ~svilen-kanev/libnotify-mozilla/tbird5 (rev 58): Use Thunderbird5's AddonManager to find python script + Explicit unpack .xpi file

58. By Kartoch on 2011-09-23

Change maximal version to 6.* to make it working with latest thunderbird

=== modified file 'content/overlay.js'
--- content/overlay.js	2011-02-18 22:37:38 +0000
+++ content/overlay.js	2011-10-10 06:51:35 +0000
@@ -86,7 +86,8 @@
                 if(!this.prefs.prefHasUserValue("onlyInbox")) {
                         this.prefs.setBoolPref("onlyInbox", false);
                 }
-                
+               
+                this.pythonpath = "" 
                 this.initIndicators();
         },
         
@@ -222,15 +223,29 @@
                 }
                         
         },
+
+        addonCallback: function(addon) {
+            tbindicator.pythonpath = addon.getResourceURI("python/indicator.py").QueryInterface(Components.interfaces.nsIFileURL).file.path;
+            tbindicator.initIndicators();
+        },
         
         initIndicators: function initIndicators() {
         
                 this.logger("init indicators");
-                var em = Components.classes["@mozilla.org/extensions/manager;1"]
-                        .getService(Components.interfaces.nsIExtensionManager);
-
-                var pythonpath = em.getInstallLocation(ADDON_ID).getItemFile(ADDON_ID, "python/indicator.py").path; 
-                this.logger("pythonpath: " + pythonpath);
+                if(this.pythonpath == "") {
+                    // Thunderbird 5 and later
+                    try {
+                    Components.utils.import("resource://gre/modules/AddonManager.jsm");
+                    AddonManager.getAddonByID(ADDON_ID, this.addonCallback);
+                    return;
+                    } catch (ex) {
+                    // Thunderbird 3.x and earlier
+                    var em = Components.classes["@mozilla.org/extensions/manager;1"]
+                            .getService(Components.interfaces.nsIExtensionManager);
+                    this.pythonpath = em.getInstallLocation(ADDON_ID).getItemFile(ADDON_ID, "python/indicator.py").path; 
+                    }
+                }
+                this.logger("pythonpath: " + this.pythonpath);
                 // Make fifo in /tmp, otherwise it won't work for a shared extension for all users (#611183)
                 var pm = Components.classes["@mozilla.org/toolkit/profile-service;1"]
                         .getService(Components.interfaces.nsIToolkitProfileService);
@@ -242,7 +257,7 @@
                 // run python server
                 var file = Components.classes["@mozilla.org/file/local;1"]
                 .createInstance(Components.interfaces.nsILocalFile);
-                file.initWithPath(pythonpath);
+                file.initWithPath(this.pythonpath);
                 if(file.permissions != 0755){
                     file.permissions = 0755;
                 }

=== modified file 'install.rdf'
--- install.rdf	2010-10-16 13:21:04 +0000
+++ install.rdf	2011-10-10 06:51:35 +0000
@@ -19,11 +19,13 @@
     <em:creator>Ruben Verweij</em:creator>
     <em:contributor>Patrik Dufresne</em:contributor>
     <em:contributor>Brian Mattern</em:contributor>
+    <em:contributor>Svilen Kanev</em:contributor>
+    <em:unpack>true</em:unpack>
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <!-- thunderbird -->
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>3.3a1pre</em:maxVersion>
+        <em:maxVersion>7.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 <em:optionsURL>chrome://tbindicator/content/options.xul</em:optionsURL>