[tor-commits] [tor-messenger-build/master] Remove OS X theme position patch

[arlo at torproject.org]

commit 18532a17f29770bbd3f3a31a374ee781f4a7f77f
Author: Arlo Breault <arlolra at gmail.com>
Date:   Thu Nov 5 16:05:24 2015 -0800

    Remove OS X theme position patch
    
     * It's causing the hangs reported in trac 17540 and trac 17456.
    
     * Opened a bug upstream
       https://bugzilla.mozilla.org/show_bug.cgi?id=1222238
---
 projects/instantbird/config                   |    2 --
 projects/instantbird/osx-theme-position.patch |   37 -------------------------
 2 files changed, 39 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index c250370..afdb042 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -100,8 +100,6 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: cert-installer.patch
     enable: '[% c("var/osx") %]'
-  - filename: osx-theme-position.patch
-    enable: '[% c("var/osx") %]'
   - filename: cert_override.txt
     enable: '[% c("var/osx") %]'
   - filename: fix-mingw-build.patch
diff --git a/projects/instantbird/osx-theme-position.patch b/projects/instantbird/osx-theme-position.patch
deleted file mode 100644
index 2c016e8..0000000
--- a/projects/instantbird/osx-theme-position.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# HG changeset patch
-# User aleth <aleth at instantbird.org>
-# Date 1437694911 -7200
-#      Fri Jul 24 01:41:51 2015 +0200
-# Node ID fee4408ddba2383c7c12e149792356fc9ff169dc
-# Parent  bb21a5dd4d1d3b9ff9f108ca8ab759504fc3ba59
-Bug 1179943 - Stop the themes preference pane being intermittently positioned too high. 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
-@@ -166,18 +166,24 @@ var previewObserver = {
-     this.browser._theme = this.theme;
-     Services.obs.addObserver(this, "conversation-loaded", false);
-   },
-
-   observe: function(aSubject, aTopic, aData) {
-     if (aTopic != "conversation-loaded" || aSubject != this.browser)
-       return;
-
-+    // Similar to the log viewer, disable the convbrowser feature
-+    // that scrolls to the last message after it has been added.
-+    this.browser._autoScrollEnabled = false;
-+    this.browser.getPendingMessagesCount =
-+      () => previewObserver.conv.messages.length + 1;
-+
-     // Display all queued messages. Use a timeout so that message text
-     // modifiers can be added with observers for this notification.
-     setTimeout(function() {
--      for each (let message in previewObserver.conv.messages)
-+      for (let message of previewObserver.conv.messages)
-         aSubject.appendMessage(message, false);
-     }, 0);
-
-     Services.obs.removeObserver(this, "conversation-loaded");
-   }
- };