← 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/enigmailSetupWizard.js

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-12-29 12:20:55 UTC
  • mfrom: (0.12.7)
  • Revision ID: package-import@ubuntu.com-20111229122055-kv6t6y3mkkud7a5t
Tags: 2:1.3.4-0ubuntu0.11.10.1
https://launchpad.net/bugs/909599
New upstream release v1.3.4 (LP: #909599)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/enigmail/ui/content/enigmailSetupWizard.js
34
34
 
35
35
Components.utils.import("resource://enigmail/enigmailCommon.jsm");
36
36
 
 
37
// const Ec is already defined in enigmailKeygen.js
 
38
 
37
39
var gEnigModifySettings;
38
40
var gLastDirection=0;
39
41
var gEnigAccountMgr;
405
407
  var userEmail = curId.email;
406
408
 
407
409
  var ipcRequest = null;
408
 
  var requestObserver = new EnigRequestObserver(wizardKeygenTerminate,null);
 
410
  var requestObserver = Ec.newRequestObserver(wizardKeygenTerminate,null);
409
411
  wizard.getButton("next").disabled = true
 
412
  wizard.getButton("back").disabled = true;
410
413
 
411
414
  try {
412
415
    ipcRequest = enigmailSvc.generateKey(window,
422
425
 
423
426
  if (!ipcRequest) {
424
427
    EnigAlert(EnigGetString("keyGenFailed"));
 
428
    wizard.getButton("back").disabled = false;
425
429
    return false;
426
430
  }
427
 
  wizard.getButton("back").disabled = true;
428
431
 
 
432
  requestObserver._terminateArg = ipcRequest;
429
433
  gKeygenRequest = ipcRequest;
430
434
 
431
435
  WRITE_LOG("enigmailKeygen.js: Start: gKeygenRequest = "+gKeygenRequest+"\n");
669
673
}
670
674
 
671
675
 
672
 
function wizardKeygenTerminate(terminateArg, ipcRequest) {
 
676
function wizardKeygenTerminate(ipcRequest) {
673
677
  DEBUG_LOG("enigmailSetupWizard.js: Terminate: "+ipcRequest+"\n");
674
678
 
 
679
  ipcRequest = ipcRequest[0];
675
680
  // Give focus to this window
676
681
  window.focus();
677
682