← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/enigmail/oneiric-proposed

« back to all changes in this revision

Viewing changes to extensions/enigmail/ui/content/pref-enigmail.js

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-01-30 19:02:40 UTC
  • mfrom: (0.12.8)
  • Revision ID: package-import@ubuntu.com-20120130190240-bjofbfbz2klwujd2
Tags: 2:1.3.5-0ubuntu0.11.10.1
https://launchpad.net/bugs/923372
https://launchpad.net/bugs/886781
* New upstream release v1.3.5
  - LP: #923372

* Fix LP: #886781 - build with --enable-chrome-format=omni, as this is
  what the chrome.manifest assumes (fixes chrome registration issues
  breaking non-English locales)
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/enigmail/ui/content/pref-enigmail.js
135
135
        agentPath = EnigGetFilePath(gEnigmailSvc.agentPath).replace(/\\\\/g, "\\");
136
136
      }
137
137
      else {
138
 
        agentPath = EnigGetFilePath(gEnigmailSvc.agentPath); // .replace(/\\\\/g, "\\");
 
138
        agentPath = gEnigmailSvc.agentPath.path;
 
139
        // EnigGetFilePath(gEnigmailSvc.agentPath); // .replace(/\\\\/g, "\\");
139
140
      }
140
141
      if (agentPath.length > 50) {
141
142
        agentPath = agentPath.substring(0,50)+"..."
475
476
                           "", false, ext,
476
477
                           fileName+ext, null);
477
478
  if (filePath) {
478
 
    document.getElementById("enigmail_agentPath").value = EnigGetFilePath(filePath);
 
479
//     if (EnigmailCommon.getOS() == "WINNT") {
 
480
//       document.getElementById("enigmail_agentPath").value = EnigGetFilePath(filePath);
 
481
//     }
 
482
    document.getElementById("enigmail_agentPath").value = filePath.path
479
483
  }
480
484
}