Bug 332362 Correct misuse of ifdefs in /mailnews. Part 2 SeaMonkey would like to have PalmSync as an extension as well. r=bienvenu,sr=neil

mailnews/extensions/palmsync/Makefile.in

@@ -66,6 +66,7 @@ PREF_JS_EXPORTS = $(srcdir)/palmsync.js
 
 XULAPP_DEFINES = \
 	-DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
+	-DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
 	-DEXTENSION_VERSION=$(MOZILLA_VERSION) \
 	$(NULL)
 

mailnews/extensions/palmsync/install.rdf

@@ -19,6 +19,15 @@
       </Description>
     </em:targetApplication>
     
+    <em:targetApplication>
+      <!-- SeaMonkey -->
+      <Description>
+        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+        <em:minVersion>@SEAMONKEY_VERSION@</em:minVersion>
+        <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    
     <em:name>Palm Sync</em:name>
     <em:description>Palm address book synchronization.</em:description>
     <em:creator>Team Thunderbird</em:creator>

mailnews/extensions/palmsync/src/nsPalmSyncSupport.cpp

@@ -45,7 +45,8 @@
 #include "nsIComponentManager.h"
 #include "nsICategoryManager.h"
 #include "nsCRT.h"
-#ifdef MOZ_THUNDERBIRD
+// XXX test for this as long as there are still non-xul-app suite builds
+#ifdef MOZ_XUL_APP
 #include "nsIExtensionManager.h"
 #endif
 #include "nsIFile.h"
@@ -119,7 +120,8 @@ nsPalmSyncSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUn
     // otherwise, take the appropriate action based on the topic
     else if (!strcmp(aTopic, "profile-after-change"))
     {
-#ifdef MOZ_THUNDERBIRD
+// XXX test for this as long as there are still non-xul-app suite builds
+#ifdef MOZ_XUL_APP
         // we can't call installPalmSync in app-startup because the extension manager hasn't been initialized yet. 
         // so we need to wait until the profile-after-change notification has fired. 
         rv = LaunchPalmSyncInstallExe(); 
@@ -128,7 +130,9 @@ nsPalmSyncSupport::Observe(nsISupports *aSubject, const char *aTopic, const PRUn
     } 
     else if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
         rv = ShutdownPalmSyncSupport();
-#ifdef MOZ_THUNDERBIRD
+
+// XXX test for this as long as there are still non-xul-app suite builds
+#ifdef MOZ_XUL_APP
     else if (aSubject && !strcmp(aTopic, "em-action-requested") && !nsCRT::strcmp(aData, NS_LITERAL_STRING("item-uninstalled").get()))
     {
         // make sure the subject is our extension.
@@ -171,7 +175,8 @@ nsPalmSyncSupport::~nsPalmSyncSupport()
 {
 }
 
-#ifdef MOZ_THUNDERBIRD
+// XXX test for this as long as there are still non-xul-app suite builds
+#ifdef MOZ_XUL_APP
 nsresult nsPalmSyncSupport::GetPalmSyncInstall(nsILocalFile ** aLocalFile)
 {
     nsresult rv;

mailnews/extensions/palmsync/src/nsPalmSyncSupport.h

@@ -67,7 +67,8 @@ class nsPalmSyncSupport : public nsIPalmSyncSupport,
         DWORD   m_dwRegister;
         CPalmSyncFactory *m_nsPalmSyncFactory;
 
-#ifdef MOZ_THUNDERBIRD
+// XXX test for this as long as there are still non-xul-app suite builds
+#ifdef MOZ_XUL_APP
         nsresult LaunchPalmSyncInstallExe();
         nsresult GetPalmSyncInstall(nsILocalFile ** aLocalFile);
 #endif