Bug 1444596 - Remove unnecessary search overlay. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 10 Mar 2018 11:13:50 +0100
changeset 31261 7fdce669bb091135dcb19602ce65fb6e92bbdd10
parent 31260 fe09f771c2d3bea2c4dd0128f79d6894a7c5657e
child 31262 57ed2a26e5fd5203d61d62703ac6d40a04d371f3
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk
bugs1444596
Bug 1444596 - Remove unnecessary search overlay. r=jorgk
mail/components/search/SpotlightIntegration.js
mail/components/search/WinSearchIntegration.js
mail/components/search/content/searchCommon.js
mail/components/search/content/searchOverlay.js
mail/components/search/content/searchOverlay.xul
mail/components/search/jar.mn
mail/components/search/moz.build
mail/components/search/searchCommon.js
--- a/mail/components/search/SpotlightIntegration.js
+++ b/mail/components/search/SpotlightIntegration.js
@@ -1,14 +1,14 @@
 /* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/. */
 
-#include content/searchCommon.js
+#include searchCommon.js
 
 var EXPORTED_SYMBOLS = ["SearchIntegration"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var MSG_DB_LARGE_COMMIT = 1;
 var gFileHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.\ncom/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>";
 
--- a/mail/components/search/WinSearchIntegration.js
+++ b/mail/components/search/WinSearchIntegration.js
@@ -1,14 +1,14 @@
 /* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/. */
 
-#include content/searchCommon.js
+#include searchCommon.js
 
 var EXPORTED_SYMBOLS = ["SearchIntegration"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var MSG_DB_LARGE_COMMIT = 1;
 var CRLF="\r\n";
 
deleted file mode 100644
--- a/mail/components/search/content/searchOverlay.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* 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/. */
-
-ChromeUtils.import("resource:///modules/SearchIntegration.js");
deleted file mode 100644
--- a/mail/components/search/content/searchOverlay.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<overlay id="search-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="searchOverlay.js"/>
-</overlay>
deleted file mode 100644
--- a/mail/components/search/jar.mn
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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:
-%   overlay chrome://messenger/content/messenger.xul            chrome://messenger/content/search/searchOverlay.xul
-    content/messenger/search/searchOverlay.xul                  (content/searchOverlay.xul)
-    content/messenger/search/searchOverlay.js                   (content/searchOverlay.js)
--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -12,10 +12,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
     EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
     FINAL_LIBRARY = 'mailcomps'
 
 DIRS += ['public']
 
 EXTRA_PP_JS_MODULES += [
     'SearchIntegration.js',
 ]
-
-JAR_MANIFESTS += ['jar.mn']
rename from mail/components/search/content/searchCommon.js
rename to mail/components/search/searchCommon.js