Bug 1476520 - Fix address book import glitches caused by bug 1475817 and bug 1469642. r=jorgk DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Wed, 18 Jul 2018 12:33:53 +0200
changeset 31773 eaad7c4f5df4ea20b6f3d36124c415347e2a8112
parent 31772 2f3444aec397e9fb3807d7fabb8b2859b377bf15
child 31774 e7b78654e6d77f473f089c12dfb143efcf00111e
push id2308
push userclokep@gmail.com
push dateWed, 05 Sep 2018 00:34:58 +0000
treeherdercomm-beta@e326b2dcd127 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1476520, 1475817, 1469642
Bug 1476520 - Fix address book import glitches caused by bug 1475817 and bug 1469642. r=jorgk DONTBUILD
mailnews/import/content/fieldMapImport.xul
mailnews/import/content/importDialog.xul
mailnews/jar.mn
--- a/mailnews/import/content/fieldMapImport.xul
+++ b/mailnews/import/content/fieldMapImport.xul
@@ -1,14 +1,17 @@
 <?xml version="1.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/. -->
-
+#ifdef MOZ_THUNDERBIRD
+<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+#else
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+#endif
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/fieldMapImport.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         buttons="accept,cancel"
         title="&fieldMapImport.title;"
         style="&fieldMapImport.size;"
         ondialogaccept="FieldImportOKButton();"
--- a/mailnews/import/content/importDialog.xul
+++ b/mailnews/import/content/importDialog.xul
@@ -82,17 +82,17 @@
                    value="&selectDescription.label;"
                    accesskey="&selectDescription.accesskey;"/>
             <label control="moduleList"
                    value="&selectDescriptionB.label;"
                    accesskey="&selectDescription.accesskey;"/>
           </deck>
           <richlistbox id="moduleList"
                        class="theme-listbox"
-                       height="250px"
+                       height="200px"
                        onselect="ImportSelectionChanged(); enableAdvance();"/>
         </vbox>
         <label>&noModulesFound.label;</label>
       </deck>
       <grid flex="1">
         <columns><column flex="1"/></columns>
         <rows>
           <row>
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -113,17 +113,17 @@ messenger.jar:
     content/messenger/messengercompose/askSendFormat.xul                       (compose/content/askSendFormat.xul)
     content/messenger/messengercompose/sendProgress.xul                        (compose/content/sendProgress.xul)
     content/messenger/messengercompose/sendProgress.js                         (compose/content/sendProgress.js)
 #ifndef MOZ_THUNDERBIRD
     content/messenger/messengercompose/menulistCompactBindings.xml             (compose/content/menulistCompactBindings.xml)
 #endif
     content/messenger/importDialog.js                                          (import/content/importDialog.js)
 *   content/messenger/importDialog.xul                                         (import/content/importDialog.xul)
-    content/messenger/fieldMapImport.xul                                       (import/content/fieldMapImport.xul)
+*   content/messenger/fieldMapImport.xul                                       (import/content/fieldMapImport.xul)
     content/messenger/fieldMapImport.js                                        (import/content/fieldMapImport.js)
     content/messenger/downloadheaders.js                                       (news/content/downloadheaders.js)
     content/messenger/downloadheaders.xul                                      (news/content/downloadheaders.xul)
     content/messenger/markByDate.js                                            (base/content/markByDate.js)
     content/messenger/markByDate.xul                                           (base/content/markByDate.xul)
     content/messenger/dateFormat.js                                            (base/content/dateFormat.js)
     content/messenger/shutdownWindow.xul                                       (base/content/shutdownWindow.xul)
     content/messenger/shutdownWindow.js                                        (base/content/shutdownWindow.js)