From 09005dc218d64bdbda9eda1dea68dc31e6bcc2c9 Mon Sep 17 00:00:00 2001 From: "bugzilla%standard8.demon.co.uk" Date: Sat, 24 Mar 2007 18:33:12 +0000 Subject: [PATCH] Bug 375054 When import mail,after selecting 'communicator',click 'next',no response. r/sr=Neil git-svn-id: svn://10.0.0.236/trunk@222324 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/import/resources/content/importDialog.js | 8 ++++++-- .../import/resources/locale/en-us/importMsgs.properties | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/mailnews/import/resources/content/importDialog.js b/mozilla/mailnews/import/resources/content/importDialog.js index 909aa0ada6e..be400d0bb84 100644 --- a/mozilla/mailnews/import/resources/content/importDialog.js +++ b/mozilla/mailnews/import/resources/content/importDialog.js @@ -663,8 +663,12 @@ function ImportMail( module, success, error) { comm4xprofile = comm4xprofile.QueryInterface( Components.interfaces.nsIComm4xProfile); if(comm4xprofile != null) { var length = {value:0}; - var profileList = comm4xprofile.getProfileList(length); - if (profileList) + var profileList = null; + try { + profileList = comm4xprofile.getProfileList(length); + } + catch (ex) {} + if (length.value) { var selected = {value:0}; if (length.value == 1) diff --git a/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties b/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties index 92fc2ad74ec..a0d09f4c23b 100644 --- a/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties +++ b/mozilla/mailnews/import/resources/locale/en-us/importMsgs.properties @@ -293,6 +293,8 @@ ImportSettingsSuccess=Settings were imported from %S ImportMailBadModule=Unable to load mail import module ImportMailNotFound=Unable to find mail to import. Check to make sure the mail application is correctly installed on this machine. # LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportMailFailed=An error occurred importing mail from %S +# LOCALIZATION NOTE : Do not translate the word "%S" below. ImportMailSuccess=Mail was successfully imported from %S # Error string for address import