[tor-commits] [tor-messenger-build/master] Add a patch for trac 16476

[arlo at torproject.org]

commit 329d846869dcb07ae534ba0c0f2a5d872e140ccf
Author: Arlo Breault <arlolra at gmail.com>
Date:   Fri Nov 6 18:11:29 2015 -0800

    Add a patch for trac 16476
    
     * Themes preference is positioned incorrectly on OS X
---
 ChangeLog                             |    3 +++
 projects/instantbird/config           |    2 ++
 projects/instantbird/trac-16476.patch |   38 +++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1ec0ae1..9c3e2f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ Tor Messenger 0.1.0b4 --
    * Bug 17492: Include default bridges configuration
    * Use tor and the pluggable transports from tor-browser 5.0.4
    * Bug 17552: Instantbird throwing on XMPP non-MUC message stanzas w/ subject
+ * Mac
+   * Bug 16476: Themes preference is positioned incorrectly
+   * Bug 17456: Hang in preferences menu
 
 Tor Messenger 0.1.0b3 -- October 30 2015
  * Windows
diff --git a/projects/instantbird/config b/projects/instantbird/config
index f9bfdb7..d2ffb5d 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -104,6 +104,8 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: cert_override.txt
     enable: '[% c("var/osx") %]'
+  - filename: trac-16476.patch
+    enable: '[% c("var/osx") %]'
   - filename: fix-mingw-build.patch
     enable: '[% c("var/windows") %]'
   - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch
diff --git a/projects/instantbird/trac-16476.patch b/projects/instantbird/trac-16476.patch
new file mode 100644
index 0000000..96eabb4
--- /dev/null
+++ b/projects/instantbird/trac-16476.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User aleth <aleth at instantbird.org>
+# Date 1446853955 -3600
+#      Sat Nov 07 00:52:35 2015 +0100
+# Node ID 1f09dc616d2e058779753327637b85f6dcc0bbf1
+# Parent  073468887b0faecb810a6e4463a2806924fead81
+Bug 1222238 - Avoid hang in proxy preferences pane. r=clokep
+
+diff --git a/im/content/preferences/messagestyle.js b/im/content/preferences/messagestyle.js
+--- a/im/content/preferences/messagestyle.js
++++ b/im/content/preferences/messagestyle.js
+@@ -169,22 +169,20 @@ var previewObserver = {
+ 
+   observe: function(aSubject, aTopic, aData) {
+     if (aTopic != "conversation-loaded" || aSubject != this.browser)
+       return;
+ 
+     // We want to avoid the convbrowser trying to scroll to the last
+     // added message, as that causes the entire pref pane to jump up
+     // (bug 1179943). Therefore, we override the method convbrowser
+-    // uses to determine if there are further messages pending to be
+-    // added. The +1 ensures no scroll occurs after we add the last
+-    // message here.
+-    this.browser._autoScrollEnabled = false;
+-    this.browser.getPendingMessagesCount =
+-      () => previewObserver.conv.messages.length + 1;
++    // uses to determine if it should scroll, as well as its
++    // mirror in the contentWindow (that messagestyle JS can call).
++    this.browser.autoScrollEnabled = () => false;
++    this.browser.contentWindow.autoScrollEnabled = () => false;
+ 
+     // Display all queued messages. Use a timeout so that message text
+     // modifiers can be added with observers for this notification.
+     setTimeout(function() {
+       for (let message of previewObserver.conv.messages)
+         aSubject.appendMessage(message, false);
+     }, 0);
+