Replace hard-coded Firefox GUIDs with Pale Moon GUID

5 files changed, 22 insertions, 4 deletions

diff --git a/services/sync/SyncComponents.manifest b/services/sync/SyncComponents.manifest
index c0565b65d..2b315656c 100644
--- a/services/sync/SyncComponents.manifest
+++ b/services/sync/SyncComponents.manifest
@@ -4,7 +4,7 @@
 # we need to restrict them to the applications that depend on them, i.e.:
 #
 #   b2g:            {3c2e2abc-06d4-11e1-ac3b-374f68613e61}
-#   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+#   browser:        {8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
 #   suite (comm):   {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
@@ -16,7 +16,7 @@
 # Weave.js
 component {74b89fb0-f200-4ae8-a3ec-dd164117f6de} Weave.js
 contract @mozilla.org/weave/service;1 {74b89fb0-f200-4ae8-a3ec-dd164117f6de}
-category app-startup WeaveService service,@mozilla.org/weave/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
+category app-startup WeaveService service,@mozilla.org/weave/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 component {d28f8a0b-95da-48f4-b712-caf37097be41} Weave.js
 contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4-b712-caf37097be41}
 
diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js
index f237280f9..9b6535d34 100644
--- a/services/sync/modules/constants.js
+++ b/services/sync/modules/constants.js
@@ -168,7 +168,7 @@ kSyncBackoffNotMet:                    "Trying to sync before the server said it
 kFirstSyncChoiceNotMade:               "User has not selected an action for first sync",
 
 // Application IDs
-FIREFOX_ID:                            "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
+FIREFOX_ID:                            "{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}",
 FENNEC_ID:                             "{a23983c0-fd0e-11dc-95ff-0800200c9a66}",
 SEAMONKEY_ID:                          "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}",
 TEST_HARNESS_ID:                       "xuth@mozilla.org",
diff --git a/services/sync/tps/extensions/mozmill/install.rdf b/services/sync/tps/extensions/mozmill/install.rdf
index 9e01a9923..165498161 100644
--- a/services/sync/tps/extensions/mozmill/install.rdf
+++ b/services/sync/tps/extensions/mozmill/install.rdf
@@ -13,6 +13,14 @@
      <em:description>A testing extension based on the Windmill Testing Framework client source</em:description>
      <em:unpack>true</em:unpack>
      <em:targetApplication>
+       <!-- Pale Moon -->
+       <Description>
+         <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
+         <em:minVersion>3.5</em:minVersion>
+         <em:maxVersion>24.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <em:targetApplication>
        <!-- Firefox -->
        <Description>
          <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
diff --git a/services/sync/tps/extensions/mozmill/resource/modules/mozmill.js b/services/sync/tps/extensions/mozmill/resource/modules/mozmill.js
index b6e439202..96fe6c92e 100644
--- a/services/sync/tps/extensions/mozmill/resource/modules/mozmill.js
+++ b/services/sync/tps/extensions/mozmill/resource/modules/mozmill.js
@@ -57,6 +57,7 @@ applicationDictionary = {
   "{718e30fb-e89b-41dd-9da7-e25a45638b28}": "Sunbird",
   "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": "SeaMonkey",
   "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}": "Firefox",
+  "{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}": "PaleMoon",
   "{3550f703-e582-4d05-9a08-453d09bdfdc6}": 'Thunderbird',
 }
 
@@ -64,7 +65,7 @@ var Application = applicationDictionary[appInfo.ID];
 
 if (Application == undefined) {
   // Default to Firefox
-  var Application = 'Firefox';
+  var Application = 'PaleMoon';
 }
 
 // get startup time if available
diff --git a/services/sync/tps/extensions/tps/install.rdf b/services/sync/tps/extensions/tps/install.rdf
index 47cd8a58a..bfa6091c5 100644
--- a/services/sync/tps/extensions/tps/install.rdf
+++ b/services/sync/tps/extensions/tps/install.rdf
@@ -10,6 +10,15 @@
     <em:version>0.2</em:version>
 
     <em:targetApplication>
+      <!-- Pale Moon -->
+      <Description>
+        <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
+        <em:minVersion>3.5.0</em:minVersion>
+        <em:maxVersion>24.0.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <em:targetApplication>
       <!-- Firefox -->
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>