commit 0dbee8e000a01062496ad4ce61f6efc1f830f7ff Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Nov 27 20:29:26 2013 -0800

Add support for Instantbird --- src/components/tl-process.js | 5 +++-- src/install.rdf | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js index a1ec60b..d1166a2 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -31,6 +31,7 @@ TorProcessService.prototype = kServiceName : "Tor Launcher Process Service", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", + kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", kTorLauncherExtPath: "tor-launcher@torproject.org", // This could vary.

kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", @@ -517,9 +518,9 @@ TorProcessService.prototype = var topDir; var appInfo = Cc["@mozilla.org/xre/app-info;1"] .getService(Ci.nsIXULAppInfo); - if (appInfo.ID == this.kThunderbirdID) + if (appInfo.ID == this.kThunderbirdID || appInfo.ID == this.kInstantbirdID) { - // For Thunderbird, paths are relative to this extension's folder. + // For Thunderbird and Instantbird, paths are relative to this extension's folder. topDir = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile); topDir.append("extensions"); diff --git a/src/install.rdf b/src/install.rdf index 7788ddb..74ee5a4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -25,7 +25,15 @@ <Description> em:id{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> em:minVersion10.0</em:minVersion> - em:maxVersion23.*</em:maxVersion> + em:maxVersion24.*</em:maxVersion> + </Description> + </em:targetApplication> + <!-- instantbird --> + em:targetApplication + <Description> + em:id{33cb9019-c295-46dd-be21-8c4936574bee}</em:id> + em:minVersion1.4</em:minVersion> + em:maxVersion1000</em:maxVersion> </Description> </em:targetApplication>