[tbb-commits] [tor-launcher/master] Bug 13983: Use CurProcD for Thunderbird/Instantbird

[brade at torproject.org]

commit c052b54b2d14032fac0c9b23a9ad9cc06d792a5a
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Thu Dec 18 10:33:29 2014 +0530

    Bug 13983: Use CurProcD for Thunderbird/Instantbird
    
    To accommodate Tor Messenger/Tor Mail bundle packaging, use a path
    relative to the current working directory when locating Tor files
    (instead of relative to the profile directory).
---
 src/components/tl-process.js |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index cc5d654..b6dc98f 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -692,9 +692,8 @@ TorProcessService.prototype =
                           .getService(Ci.nsIXULAppInfo);
           if (appInfo.ID == this.kThunderbirdID || appInfo.ID == this.kInstantbirdID)
           {
-            // 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);
+                       .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile);
             topDir.append("extensions");
             topDir.append(this.kTorLauncherExtPath);
           }