Bug 1544013 - Follow-up: s/Firefox/Thunderbird/ in chrome_settings_overrides.json. r=me
authorJorg K <jorgk@jorgk.com>
Mon, 15 Apr 2019 18:29:17 +0200
changeset 26346 dd798dde8956500e6d0cadb22875a28fcd891c1b
parent 26345 ad2d84d80a1ee61bd4ba33a33715a9859236a388
child 26347 d6abc17e8bc5829da3e0837b52ab9bb5c29deb27
push id15795
push usermozilla@jorgk.com
push dateMon, 15 Apr 2019 16:34:07 +0000
treeherdercomm-central@dd798dde8956 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1544013
Bug 1544013 - Follow-up: s/Firefox/Thunderbird/ in chrome_settings_overrides.json. r=me
mail/components/extensions/schemas/chrome_settings_overrides.json
mail/components/search/jar.mn
--- a/mail/components/extensions/schemas/chrome_settings_overrides.json
+++ b/mail/components/extensions/schemas/chrome_settings_overrides.json
@@ -42,24 +42,24 @@
                     "pattern": "^https://.*$|^$",
                     "preprocess": "localize"
                   },
                   "instant_url": {
                     "type": "string",
                     "optional": true,
                     "format": "url",
                     "preprocess": "localize",
-                    "deprecated": "Unsupported on Firefox at this time."
+                    "deprecated": "Unsupported on Thunderbird at this time."
                   },
                   "image_url": {
                     "type": "string",
                     "optional": true,
                     "format": "url",
                     "preprocess": "localize",
-                    "deprecated": "Unsupported on Firefox at this time."
+                    "deprecated": "Unsupported on Thunderbird at this time."
                   },
                   "search_url_get_params": {
                     "type": "string",
                     "optional": true,
                     "preprocess": "localize",
                     "description": "GET parameters to the search_url as a query string."
                   },
                   "search_url_post_params": {
@@ -79,45 +79,45 @@
                     "optional": true,
                     "preprocess": "localize",
                     "description": "POST parameters to the suggest_url as a query string."
                   },
                   "instant_url_post_params": {
                     "type": "string",
                     "optional": true,
                     "preprocess": "localize",
-                    "deprecated": "Unsupported on Firefox at this time."
+                    "deprecated": "Unsupported on Thunderbird at this time."
                   },
                   "image_url_post_params": {
                     "type": "string",
                     "optional": true,
                     "preprocess": "localize",
-                    "deprecated": "Unsupported on Firefox at this time."
+                    "deprecated": "Unsupported on Thunderbird at this time."
                   },
                   "search_form": {
                     "type": "string",
                     "optional": true,
                     "format": "url",
                     "pattern": "^https://.*$",
                     "preprocess": "localize"
                   },
                   "alternate_urls": {
                     "type": "array",
                     "items": {
                       "type": "string",
                       "format": "url",
                       "preprocess": "localize"
                     },
                     "optional": true,
-                    "deprecated": "Unsupported on Firefox at this time."
+                    "deprecated": "Unsupported on Thunderbird at this time."
                   },
                   "prepopulated_id": {
                     "type": "integer",
                     "optional": true,
-                    "deprecated": "Unsupported on Firefox."
+                    "deprecated": "Unsupported on Thunderbird."
                   },
                   "encoding": {
                     "type": "string",
                     "optional": true,
                     "description": "Encoding of the search term."
                   },
                   "is_default": {
                     "type": "boolean",
@@ -154,17 +154,17 @@
                         "value": {
                           "type": "string",
                           "optional": true,
                           "description": "A url parameter value.",
                           "preprocess": "localize"
                         }
                       }
                     },
-                    "description": "A list of optional search url parameters. This allows the additon of search url parameters based on how the search is performed in Firefox."
+                    "description": "A list of optional search url parameters. This allows the additon of search url parameters based on how the search is performed in Thunderbird."
                   }
                 }
               }
             }
           }
         }
       }
     ]
--- a/mail/components/search/jar.mn
+++ b/mail/components/search/jar.mn
@@ -1,13 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
+# See bug 1544013: Temporarily use search extensions from Firefox.
     search-extensions/                        (../../../../browser/components/search/extensions/**)
 #ifdef XP_MACOSX
     content/messenger/SpotlightIntegration.js (content/SpotlightIntegration.js)
 #endif
 #ifdef XP_WIN
     content/messenger/WinSearchIntegration.js (content/WinSearchIntegration.js)
 #endif