From 9368ec1154de3e044fe2862154137a9ff601e8a5 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Sat, 28 Oct 2006 22:56:46 +0000
Subject: [PATCH] unfork accountUtils.js b=353906 sr=mscott

---
 .../base/prefs/resources/content/accountUtils.js   | 14 +++++++-------
 mailnews/jar.mn                                    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mailnews/base/prefs/resources/content/accountUtils.js b/mailnews/base/prefs/resources/content/accountUtils.js
index 9952d0a6f345..a8ab78dba63b 100644
--- a/mailnews/base/prefs/resources/content/accountUtils.js
+++ b/mailnews/base/prefs/resources/content/accountUtils.js
@@ -78,7 +78,6 @@ function getInvalidAccounts(accounts)
     return invalidAccounts;
 }
 
-#ifndef MOZ_THUNDERBIRD
 // This function gets called from verifyAccounts.
 // We do not have to do anything on
 // unix and mac but on windows we have to bring up a 
@@ -122,7 +121,6 @@ function showMailIntegrationDialog() {
         }
     }
 }
-#endif
 
 function verifyAccounts(wizardcallback) 
 {
@@ -219,11 +217,13 @@ function verifyAccounts(wizardcallback)
           }
         }
         
-#ifndef MOZ_THUNDERBIRD
-        // seamonkey still uses this...
-        // hack, set a time out to do this, so that the window can load first
-        setTimeout("showMailIntegrationDialog();",0);
-#endif
+        // This will only succeed on SeaMonkey windows builds
+        var mapiRegistryProgID = "@mozilla.org/mapiregistry;1" 
+        if (mapiRegistryProgID in Components.classes)
+        {
+          // hack, set a time out to do this, so that the window can load first
+          setTimeout(showMailIntegrationDialog, 0);
+        }
 
         return ret;
     }
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index af35c98baa86..47939e915f19 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -82,7 +82,7 @@ messenger.jar:
     content/messenger/aw-login.js                                              (base/prefs/resources/content/aw-login.js)
     content/messenger/aw-accname.js                                            (base/prefs/resources/content/aw-accname.js)
     content/messenger/aw-done.js                                               (base/prefs/resources/content/aw-done.js)
-*   content/messenger/accountUtils.js                                          (base/prefs/resources/content/accountUtils.js)
+    content/messenger/accountUtils.js                                          (base/prefs/resources/content/accountUtils.js)
     content/messenger/amUtils.js                                               (base/prefs/resources/content/amUtils.js)
     content/messenger/ispUtils.js                                              (base/prefs/resources/content/ispUtils.js)
     content/messenger/SmtpServerEdit.xul                                       (base/prefs/resources/content/SmtpServerEdit.xul)