[tor-commits] [tor-messenger-build/master] Rebase search-preferences-xul.patch

[sukhbir at torproject.org]

commit e685124f34a392240d7b773728f39651407e2129
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Fri Nov 6 16:50:43 2015 -0500

    Rebase search-preferences-xul.patch
---
 projects/instantbird/search-preferences-xul.patch |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/instantbird/search-preferences-xul.patch b/projects/instantbird/search-preferences-xul.patch
index 647d9a5..a6b2a31 100644
--- a/projects/instantbird/search-preferences-xul.patch
+++ b/projects/instantbird/search-preferences-xul.patch
@@ -1,7 +1,7 @@
 diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanced.xul
 --- a/im/content/preferences/advanced.xul
 +++ b/im/content/preferences/advanced.xul
-@@ -135,17 +135,6 @@
+@@ -143,17 +143,6 @@
                        preference="layout.spellcheckDefault"/>
            </groupbox>
  
@@ -16,6 +16,6 @@ diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanc
 -                    oncommand="gAdvancedPane.showSearchEngineManager();"/>
 -          </groupbox>
 -
- #ifdef HAVE_SHELL_SERVICE
-           <!-- System Defaults -->
-           <groupbox id="systemDefaultsGroup" orient="horizontal">
+           <!-- Advanced Configuration -->
+           <groupbox>
+             <caption label="&configEditDesc.label;"/>