[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-messenger-build/master] Rebase patches for THUNDERBIRD_42_0b2_RELEASE
commit afbffe7ff6d3bb4c3a0eee82d21284e15dccc102
Author: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
Date: Tue Nov 17 16:32:44 2015 -0500
Rebase patches for THUNDERBIRD_42_0b2_RELEASE
---
projects/instantbird/cert-installer.patch | 12 ++++++------
projects/instantbird/config | 2 +-
projects/instantbird/preferences.patch | 3 +--
projects/instantbird/top-protocols.patch | 2 +-
projects/instantbird/trac-16476.patch | 29 ++++++++---------------------
5 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch
index 96b87c3..58e8020 100644
--- a/projects/instantbird/cert-installer.patch
+++ b/projects/instantbird/cert-installer.patch
@@ -1,14 +1,14 @@
diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build
--- a/im/app/profile/moz.build
+++ b/im/app/profile/moz.build
-@@ -7,3 +7,7 @@
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'mac', 'cocoa'):
+@@ -9,6 +9,7 @@
DEFINES['HAVE_SHELL_SERVICE'] = 1
-+
-+FINAL_TARGET_FILES.defaults.profile += [
+
+ FINAL_TARGET_FILES.defaults.profile += [
+ 'cert_override.txt',
-+]
+ 'localstore.rdf',
+ 'mimeTypes.rdf',
+ ]
diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
index edf01b1..78db5e4 100644
--- a/im/installer/package-manifest.in
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 22c1bb3..35bc214 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
hg_url: https://hg.mozilla.org/releases/comm-release/
-hg_hash: THUNDERBIRD_41_0b1_RELEASE
+hg_hash: THUNDERBIRD_42_0b2_RELEASE
filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]"
remote_docker: 1
var:
diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch
index cb789ee..72f2ab0 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -79,7 +79,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.
// The breakpad report server to link to in about:crashes
pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/";);
-@@ -297,14 +278,84 @@
+@@ -297,14 +278,82 @@
// 3 at the end of the tabstrip
pref("browser.tabs.closeButtons", 1);
@@ -131,7 +131,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.
+// Disable geolocation
+pref("geo.enabled", false);
+
-+// Messenger
+// Do not report idle status or the away message
+pref("messenger.status.awayWhenIdle", false);
+pref("messenger.status.defaultIdleAwayMessage", "");
diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch
index db1b3e8..b7202cc 100644
--- a/projects/instantbird/top-protocols.patch
+++ b/projects/instantbird/top-protocols.patch
@@ -5,7 +5,7 @@ diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/l
# Exceeding 4 protocols may cause scrolling. A list of the
# available protocols can be found at
# https://wiki.instantbird.org/Protocol_Identifiers
--topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-msn,prpl-yahoo
+-topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-yahoo
+topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook
# LOCALIZATION NOTE
diff --git a/projects/instantbird/trac-16476.patch b/projects/instantbird/trac-16476.patch
index 720a470..2f9829a 100644
--- a/projects/instantbird/trac-16476.patch
+++ b/projects/instantbird/trac-16476.patch
@@ -10,28 +10,15 @@ 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
-@@ -166,16 +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;
-
-+ // 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 it should scroll, as well as its
-+ // mirror in the contentWindow (that messagestyle JS can call).
+@@ -177,9 +177,8 @@
+ // 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;
+ 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 each (let message in previewObserver.conv.messages)
- aSubject.appendMessage(message, false);
- }, 0);
-
- Services.obs.removeObserver(this, "conversation-loaded");
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits