[tor-commits] [torbirdy/develop] Add changelog for version 0.2.1

2016-11-24 Thread sukhbir 
commit c1f8eb6b2216436c12465cd7cfe62d471be881d6
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Nov 7 05:34:06 2016 -0500

Add changelog for version 0.2.1
---
 ChangeLog | 5 +
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ac49c95..a2bbd8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.2.1,
+ * Bug 20157: Do not set calendar timezone to UTC
+ * Revert setting no_proxies_on to an empty string
+ * Added support for automatic configuration of systemli.org email accounts
+
 0.2.0, 27 Jun 2016
 
  * Bug 6314: Prevent local timestamp disclosure via Date header



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Improve code formatting

2016-11-24 Thread sukhbir 
commit 440ee19bb05152b2934d0b3d582fb3d9c02f
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Jun 6 00:59:27 2016 -0400

Improve code formatting
---
 chrome/content/emailwizard.js | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 0c50e6f..2c0828a 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -140,11 +140,15 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   gEmailConfigWizard.displayConfigResult = function(config) {
 old_displayConfigResult.call(this, config);
 var radiogroup = document.getElementById("result_imappop");
-if (radiogroup.hidden) return;
+if (radiogroup.hidden) {
+  return;
+}
 // We can only run the monkeypatch code below once -- this
 // method is called every time we change selection, preventing
 // us from changing the selection away from POP.
-if (result_imappop_hacks_run_once) return;
+if (result_imappop_hacks_run_once) {
+  return;
+}
 result_imappop_hacks_run_once = true;
 var imap_element = document.getElementById("result_select_imap");
 var pop_element = document.getElementById("result_select_pop3");



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Make extensions.torbirdy.defaultprotocol affect the auto wizard.

2016-11-24 Thread sukhbir 
commit c2d74fe85b70622dfebb21ee4b2fccc620a0a1e2
Author: anonym 
Date:   Tue May 24 03:43:09 2016 +0200

Make extensions.torbirdy.defaultprotocol affect the auto wizard.

I.e. if we prefer POP over IMAP, let's pre-select any POP result we
have probed, and let's make POP the default in the manual
configuration mode.
---
 chrome/content/emailwizard.js | 33 +
 1 file changed, 33 insertions(+)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 9d88d70..0c50e6f 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -130,6 +130,39 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   window.close();
 }
 else {
+  var prefer_pop = Preferences.get("extensions.torbirdy.defaultprotocol") 
!= 1;
+  // Both of these monkeypatches hook in only to change the
+  // selection default (POP vs IMAP according to our pref) at
+  // suitable times, i.e. when the page has been pre-filled and is
+  // finally presented to user action.
+  var result_imappop_hacks_run_once = false;
+  var old_displayConfigResult = gEmailConfigWizard.displayConfigResult;
+  gEmailConfigWizard.displayConfigResult = function(config) {
+old_displayConfigResult.call(this, config);
+var radiogroup = document.getElementById("result_imappop");
+if (radiogroup.hidden) return;
+// We can only run the monkeypatch code below once -- this
+// method is called every time we change selection, preventing
+// us from changing the selection away from POP.
+if (result_imappop_hacks_run_once) return;
+result_imappop_hacks_run_once = true;
+var imap_element = document.getElementById("result_select_imap");
+var pop_element = document.getElementById("result_select_pop3");
+if (prefer_pop && imap_element.selected && pop_element) {
+  radiogroup.selectedItem = pop_element;
+  gEmailConfigWizard.onResultIMAPOrPOP3();
+}
+  }
+  var old_fillManualEditFields = gEmailConfigWizard._fillManualEditFields;
+  gEmailConfigWizard._fillManualEditFields = function(config) {
+old_fillManualEditFields.call(this, config);
+if (prefer_pop) {
+  // In this itemlist, POP is located at index 1.
+  document.getElementById("incoming_protocol").selectedIndex = 1;
+  gEmailConfigWizard.onChangedProtocolIncoming();
+}
+  }
+
   // From 
comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : 
finish().
   // We need somewhere to hook in, so we can access the new
   // account object created through the autoconfig wizard, and



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Revert setting no_proxies_on to an empty string

2016-11-24 Thread sukhbir 
commit b2f6a45bdfebe71072bd9c791a92383ecc087dc2
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Sat Jul 2 13:11:17 2016 -0400

Revert setting no_proxies_on to an empty string

This breaks certain configurations and actually doesn't give us much 
benefit;
reverting to the Firefox/Thunderbird default.
---
 components/torbirdy.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index d4743e0..11015b9 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -37,8 +37,6 @@ var TorBirdyPrefs = {
 
   // Use a manual proxy configuration.
   "network.proxy.type": 1,
-  // https://bugs.torproject.org/10419
-  "network.proxy.no_proxies_on": "",
   // Restrict TBB ports.
   "network.security.ports.banned": "9050,9051,9150,9151",
   // Number of seconds to wait before attempting to recontact an unresponsive 
proxy server.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Added support for automatic configuration of systemli.org email accounts

2016-11-24 Thread sukhbir 
commit 9204ddc23dbb6bf755af91a933f2a3fb210ba0d2
Author: shadow 
Date:   Wed Jun 29 15:33:37 2016 +0200

Added support for automatic configuration of systemli.org email accounts
---
 chrome/content/emailwizard.js | 4 
 1 file changed, 4 insertions(+)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 2da6ad7..d09ea5b 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -106,6 +106,10 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   config.incoming.hostname = "mail.%EMAILDOMAIN%";
   config.outgoing.hostname = "mail.%EMAILDOMAIN%";
   break;
+case "systemli.org":
+  config.incoming.hostname = "mail.%EMAILDOMAIN%";
+  config.outgoing.hostname = "mail.%EMAILDOMAIN%";
+  break;
   }
 
   replaceVariables(config, realname, email, password);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update port to 9150 (related to #19049)

2016-11-24 Thread sukhbir 
commit de52ae9026cb207faf69e2218ec0a5e26009b220
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Jun 20 10:29:52 2016 -0400

Update port to 9150 (related to #19049)
---
 chrome/content/preferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index c843d3c..59fe209 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -41,7 +41,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
 if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
   opts += "--throw-keyids ";
 }
-var proxy = "socks5h://127.0.0.1:9050";
+var proxy = "socks5h://127.0.0.1:9150";
 if (anonService === "jondo") {
   proxy = "http://127.0.0.1:4001;;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update changelog and set version to 0.2.0

2016-11-24 Thread sukhbir 
commit 1319ae8e33b4c6ee5ff61e9bb9f87ece14f2636d
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Jun 15 09:49:06 2016 -0400

Update changelog and set version to 0.2.0
---
 ChangeLog   | 25 +++--
 install.rdf |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5b4021..6dfb72f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+0.2.0, 
+
+ * Bug 6314: Prevent local timestamp disclosure via Date header
+ * Bug 6315: Prevent local timestamp disclosure via Message-ID header
+ * Bug 13721: Fix usage of wrong locale
+ * Bug 17426: Allow configuration of default email protocol
+ * Bug 15459: Add support for deterministic XPI generation
+ * Bug 11387, 13006: Fix non-standard EHLO argument
+ * Bug 17118: Allow manual account configuration for Gmail with OAuth2
+ * Bug 19031: Add and audit support for RSS reader
+ * Bug 7847: Audit and update support for NNTP
+ * Bug 10683: Update Thunderbird UI to reflect TorBirdy's state
+ * Bug 19330: Set secure defaults for outgoing mail servers
+ * Removed compatibility for older versions of Thunderbird and added support
+ for Thunderbird 37+.
+ * Added support for automatic configuration of Riseup email accounts.
+ * Updated various privacy and security settings (see commit 2bdeffbb for a
+ list of the changes)
+ * Update translations for existing languages
+ * Many thanks to Arthur Edelstein and the Tails Developers for this release
+
 0.1.4, 09 March 2015
   * Fix bug that prevented Thunderbird with TorBirdy 0.1.3 from starting
   in profiles with more than three IMAP accounts (closes #14099, #13982,
@@ -35,10 +56,10 @@
 * Korean
 * Latvian
 * Norwegian Bokmål 
-* Norwegian Nynorsk
+* Norwegian Nynorsk
 * Punjabi
 * Polish
-* Portuguese
+* Portuguese
 * Portuguese (Brazil)
 * Romanian
 * Russian
diff --git a/install.rdf b/install.rdf
index ffe53cd..801c7ad 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#;>
   
 castironthunderbirdc...@torproject.org
-0.1.4
+0.2.0
 2
 
chrome://castironthunderbirdclub/skin/images/tor.png
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Prevent third-party images from loading

2016-11-24 Thread sukhbir 
commit 7b5fd8c94ebdf81b6d0e8893a75aa64d48e4cf53
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu May 19 09:39:12 2016 -0400

Prevent third-party images from loading

In theory we can allow all images but in the context of Thunderbird, 
blocking
third-party images should be fine. Earlier we were blocking all images but
that isn't really required.
---
 components/torbirdy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index eb64df6..a113323 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -352,7 +352,7 @@ var TorBirdyPrefs = {
   "gfx.downloadable_fonts.enabled": false,
 
   // Disable remote images.
-  "permissions.default.image": 2,
+  "permissions.default.image": 3,
 
   /*
Finish



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Bump version to 0.2.1

2016-11-24 Thread sukhbir 
commit 5da0998476219764e3d8b06d4c12350ee042e143
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Nov 24 11:20:05 2016 -0500

Bump version to 0.2.1
---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index 801c7ad..93736d4 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#;>
   
 castironthunderbirdc...@torproject.org
-0.2.0
+0.2.1
 2
 
chrome://castironthunderbirdclub/skin/images/tor.png
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update log comments

2016-11-24 Thread sukhbir 
commit c0337354dd972fecef30f651ab987cc6c375e39d
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Jun 15 08:40:19 2016 -0400

Update log comments
---
 components/torbirdy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 1f569d0..84ea9c7 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -459,7 +459,7 @@ TorBirdy.prototype = {
   onUninstalling: function(addon, needsRestart) {
 this.onStateChange();
 if (addon.id == TB_ID) {
-  dump("Nooo! TorBirdy uninstall requested\n");
+  dump("TorBirdy uninstall requested\n");
   this._uninstall = true;
   this.resetUserPrefs();
 }
@@ -468,7 +468,7 @@ TorBirdy.prototype = {
   onOperationCancelled: function(addon) {
 this.onStateChange();
 if (addon.id == TB_ID) {
-  dump("Uninstall requested cancelled. Yayay!\n");
+  dump("Uninstall requested cancelled\n");
   this._uninstall = false;
   this.setPrefs();
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Bug 20750, 20644: Ensure RSS feeds are displayed as plain text

2016-11-24 Thread sukhbir 
commit 1ee985b6d113780c0cfc0501ece56ca99e98a350
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Nov 24 01:30:13 2016 -0500

Bug 20750, 20644: Ensure RSS feeds are displayed as plain text
---
 components/torbirdy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 6d6bd23..41baf5f 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -320,6 +320,7 @@ var TorBirdyPrefs = {
   // These are similar to the mailnews.* settings.
   "rss.display.disallow_mime_handlers": 3,
   "rss.display.html_as": 1,
+  "rss.show.content-base": 1,
 
   // Override the user agent by setting it to an empty string.
   "general.useragent.override": "",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Global let/const are no longer properties (bugzilla #1209777)

2016-11-24 Thread sukhbir 
commit 31de9e4937791467752bc071104e9363a41735c2
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 16 14:57:29 2016 -0400

Global let/const are no longer properties (bugzilla #1209777)
---
 chrome/content/composeoverlay.js |  4 ++--
 components/torbirdy.js   | 25 -
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js
index 25402b3..843cfbc 100644
--- a/chrome/content/composeoverlay.js
+++ b/chrome/content/composeoverlay.js
@@ -1,5 +1,5 @@
-const Ci = Components.interfaces;
-const Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
 
 function torbirdyTextRandom() {
   // Generate alphanumeric random numbers.
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 5e8e9ca..ead2508 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -1,18 +1,18 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
 
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-const Cr = Components.results;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
+var Cr = Components.results;
 
-const SERVICE_CTRID = "@torproject.org/torbirdy;1";
-const SERVICE_ID= Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}");
-const SERVICE_NAME  = "Main TorBirdy Component";
-const TB_ID = "castironthunderbirdc...@torproject.org";
+var SERVICE_CTRID = "@torproject.org/torbirdy;1";
+var SERVICE_ID= Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}");
+var SERVICE_NAME  = "Main TorBirdy Component";
+var TB_ID = "castironthunderbirdc...@torproject.org";
 
-const kPrefBranch = "extensions.torbirdy.custom.";
-const kRestoreBranch  = "extensions.torbirdy.restore.";
-const kTorBirdyBranch = "extensions.torbirdy.";
+var kPrefBranch = "extensions.torbirdy.custom.";
+var kRestoreBranch  = "extensions.torbirdy.restore.";
+var kTorBirdyBranch = "extensions.torbirdy.";
 
 // Default preference values for TorBirdy.
 // These preferences values will be "enforced": even if the user decides to
@@ -23,7 +23,7 @@ const kTorBirdyBranch = "extensions.torbirdy.";
 // the secure default when Thunderbird starts.
 // There are some preferences that can be overwritten using TorBirdy's
 // preferences dialog. See `preferences.js'.
-const TorBirdyPrefs = {
+var TorBirdyPrefs = {
   "extensions.torbirdy.protected": false,
   // When the preferences below have been set, enable TorBirdy.
 
@@ -211,7 +211,6 @@ const TorBirdyPrefs = {
   "browser.cache.memory.enable": false,
   "browser.cache.offline.enable": false,
   "browser.formfill.enable": false,
-  "signon.rememberSignons": false,
   "signon.autofillForms": false,
 
   // https://bugs.torproject.org/10367
@@ -675,4 +674,4 @@ TorBirdy.prototype = {
 
 }
 
-const NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Use the same port for Enigmail as used in the network settings (#19049)

2016-11-24 Thread sukhbir 
commit 2a8e7d8dfb5360fa1772796ee3f6dcc33474d0e1
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Jun 8 06:26:53 2016 -0400

Use the same port for Enigmail as used in the network settings (#19049)
---
 components/torbirdy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 1c71bf0..1f569d0 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -274,7 +274,7 @@ var TorBirdyPrefs = {
   // We want to force UTF-8 
everywhere
   "--display-charset utf-8 " +
   // We want to ensure that 
Enigmail is proxy aware even when it runs gpg in a shell
-  "--keyserver-options 
http-proxy=socks5h://127.0.0.1:9050 ",
+  "--keyserver-options 
http-proxy=socks5h://127.0.0.1:9150 ",
 
   // The default key server should be a hidden service and this is the only 
known one (it's part of the normal SKS network)
   "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Remove redundant security settings

2016-11-24 Thread sukhbir 
commit 776e7cb2700c7cc5f2416ff1036684ea7e605665
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu May 19 09:23:12 2016 -0400

Remove redundant security settings

We have supported servers that do not support secure renegotiation but that
was a long time ago when some servers didn't support it. This setting should
no longer be required.
---
 chrome/content/preferences.js  | 19 +--
 chrome/content/preferences.xul | 10 --
 chrome/locale/en/torbirdy.dtd  |  3 ---
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index f1bf091..682b367 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -45,6 +45,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
 if (anonService === "jondo") {
   proxy = "http://127.0.0.1:4001;;
 }
+
 return opts +
"--no-emit-version " +
"--no-comments " +
@@ -363,18 +364,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   pub.prefs.setBoolPref(pub.prefBranch + 'emailwizard', false);
 }
 
-// Insecure renegotiation - default: false (opt-out for mailservers that do
-// not support secure renegotiation yet)
-var securityRenegotiation = 'security.ssl.require_safe_negotiation';
-var securityWarn = 'security.ssl.treat_unsafe_negotiation_as_broken';
-if (pub.secureRenegotiation.checked) {
-  pub.setPreferences(securityRenegotiation, false);
-  pub.setPreferences(securityWarn, false);
-} else {
-  pub.clearSinglePref(securityRenegotiation);
-  pub.clearSinglePref(securityWarn);
-}
-
 if (index === 1) {
   // JonDo.
   if (pub.anonCustomService.selectedIndex === 0) {
@@ -535,12 +524,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
 /*
  Security
 */
-// Allow insecure renegotiation - default: false
-if (pub.prefs.prefHasUserValue(pub.customBranch + 
'security.ssl.require_safe_negotiation')) {
-  pub.secureRenegotiation.checked = true;
-} else {
-  pub.secureRenegotiation.checked = false;
-}
 
 // Load the email accounts.
 var accounts = pub.getAccount();
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 2526f4d..8db7230 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -28,7 +28,6 @@
   
   
   
-  
 
 
 
@@ -148,15 +147,6 @@
   
 
   
-  
-
-
-  
-  
-  
-
-
-  
 
 
 
diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd
index d670135..26d357e 100644
--- a/chrome/locale/en/torbirdy.dtd
+++ b/chrome/locale/en/torbirdy.dtd
@@ -19,7 +19,6 @@
 
 
 
-
 
 
 
@@ -45,8 +44,6 @@
 
 
 
-
-
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update TorBirdy signing key

2016-11-24 Thread sukhbir 
commit 06b2419e020ff7a8ad47d6b9434d3161b9f85090
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Fri Jun 24 13:42:35 2016 -0400

Update TorBirdy signing key
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7dca2f9..61554fe 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,14 @@ clean:
rm -f ../torbirdy-$(VERSION).xpi
 
 git-tag:
-   git tag -u 0xD255D3F5C868227F -s $(VERSION)
+   git tag -u 0xB01C8B006DA77FAA -s $(VERSION)
 
 git-push:
git push --tags
git push
 
 sign-release:
-   gpg -u 0xD255D3F5C868227F -abs ../torbirdy-${VERSION}.xpi$
+   gpg -u 0xB01C8B006DA77FAA -abs ../torbirdy-${VERSION}.xpi$
sha1sum ../torbirdy-${VERSION}.xpi$
 
 push-release:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update fetching preference value for default protocol

2016-11-24 Thread sukhbir 
commit 602b5d8f7d342ec86f3494791e65ecc5bfd097a6
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed May 4 13:35:53 2016 -0400

Update fetching preference value for default protocol
---
 chrome/content/emailwizard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 8218c1b..0223e7a 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -140,7 +140,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
 document.getElementById("provisioner_button").hidden = true;
 
 // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and 
prefs.js.
-var selectProtocol = 
prefs.getIntPref("extensions.torbirdy.defaultprotocol")
+var selectProtocol = Preferences.get("extensions.torbirdy.defaultprotocol")
 document.getElementById("torbirdy-protocol").selectedIndex = 
selectProtocol;
   };
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update comments and fix typo

2016-11-24 Thread sukhbir 
commit 454ceb1023f316331bc5e800aaf3969c22c92266
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Jun 6 01:14:52 2016 -0400

Update comments and fix typo
---
 chrome/content/emailwizard.js | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 2c0828a..2da6ad7 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -130,11 +130,12 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   window.close();
 }
 else {
+  // If the autoconfig wizard is enabled, or we are running in Tails.
   var prefer_pop = Preferences.get("extensions.torbirdy.defaultprotocol") 
!= 1;
-  // Both of these monkeypatches hook in only to change the
-  // selection default (POP vs IMAP according to our pref) at
-  // suitable times, i.e. when the page has been pre-filled and is
-  // finally presented to user action.
+  // Both of these monkeypatches hook in only to change the selection
+  // default (POP vs IMAP according to our pref) at suitable times, i.e.
+  // when the page has been pre-filled and is finally presented to user
+  // action.
   var result_imappop_hacks_run_once = false;
   var old_displayConfigResult = gEmailConfigWizard.displayConfigResult;
   gEmailConfigWizard.displayConfigResult = function(config) {
@@ -143,9 +144,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
 if (radiogroup.hidden) {
   return;
 }
-// We can only run the monkeypatch code below once -- this
-// method is called every time we change selection, preventing
-// us from changing the selection away from POP.
+// We can only run the monkeypatch code below once -- this method is
+// called every time we change selection, preventing us from changing
+// the selection away from POP.
 if (result_imappop_hacks_run_once) {
   return;
 }
@@ -161,7 +162,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   gEmailConfigWizard._fillManualEditFields = function(config) {
 old_fillManualEditFields.call(this, config);
 if (prefer_pop) {
-  // In this itemlist, POP is located at index 1.
+  // In this itemlist, POP3 is located at index 1.
   document.getElementById("incoming_protocol").selectedIndex = 1;
   gEmailConfigWizard.onChangedProtocolIncoming();
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Merge pull request #32 from arthuredelstein/6314+1

2016-11-24 Thread sukhbir 
commit 385f4ab430f6d4462b055543f2c54297a70ec5ff
Merge: 1319ae8 230ba97
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Fri Jun 17 11:44:07 2016 -0400

Merge pull request #32 from arthuredelstein/6314+1

Bug 6314: Ensure Date header uses UTC string

 components/torbirdy.js | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Don't deal with some account settings twice.

2016-11-24 Thread sukhbir 
commit 56150f9c520a4d995a2f187471a462395ca8760e
Author: anonym 
Date:   Thu Mar 10 00:58:40 2016 +0100

Don't deal with some account settings twice.

We already deal with these in fixupTorbirdySettingsOnNewAccount()
through prefs.
---
 chrome/content/emailwizard.js | 4 
 1 file changed, 4 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index fc2d48e..30024ac 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -81,10 +81,6 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
   config.incoming.auth = 3;
   config.outgoing.auth = 3;
 
-  // Set default values to disable automatic email fetching.
-  config.incoming.loginAtStartup = false;
-  config.incoming.downloadOnBiff = false;
-
   // Default the outgoing SMTP port.
   config.outgoing.port = 465;
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Remove redundant patches and associated overlays for #6314 and #6315

2016-11-24 Thread sukhbir 
commit 6b53dfaa246f46ae83abd3e2edf5dd12643c2ec6
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 16 17:43:23 2016 -0400

Remove redundant patches and associated overlays for #6314 and #6315

Patches for the above two bugs have been merged upstream by Arthur Edelstein
and our patches and the overlay for the messenger window are redundant. See
the above tickets for more information.
---
 Makefile  |   4 +-
 chrome.manifest   |   1 -
 chrome/content/composeoverlay.js  |  85 -
 chrome/content/composeoverlay.xul |   7 --
 chrome/skin/contents.rdf  |   4 --
 patches/date.patch|  70 
 patches/mailnewspref.patch|  26 
 patches/messageid.patch   |  49 --
 patches/unified.patch | 130 --
 9 files changed, 2 insertions(+), 374 deletions(-)

diff --git a/Makefile b/Makefile
index 48c661c..7dca2f9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ VERSION := $(shell cat install.rdf|grep ''|cut 
-d\> -f2|cut -d\< -f1
 FAKETIME := 2101
 
 make-xpi:
-   zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x 
"ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x 
"README.RELEASE"
+   zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "ChangeLog" -x 
"Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE"
 
 make-reproducible:
find . -print0 | xargs -0 touch -t $(FAKETIME)
-   zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x 
"patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x 
"import-translations.sh" -x "README.RELEASE" -x *.git*
+   zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x 
"ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x 
"README.RELEASE" -x *.git*
 
 clean:
rm -f ../torbirdy-$(VERSION).xpi
diff --git a/chrome.manifest b/chrome.manifest
index 33b0a10..d61ecd5 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,7 +1,6 @@
 content castironthunderbirdclub chrome/content/
 
 overlay chrome://messenger/content/messenger.xul 
chrome://castironthunderbirdclub/content/overlay.xul 
application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-overlay chrome://messenger/content/messengercompose/messengercompose.xul 
chrome://castironthunderbirdclub/content/composeoverlay.xul
 overlay chrome://messenger/content/accountcreation/emailWizard.xul 
chrome://castironthunderbirdclub/content/emailwizard.xul
 overlay chrome://messenger-newsblog/content/feedAccountWizard.xul 
chrome://castironthunderbirdclub/content/feedwizard.xul
 overlay chrome://messenger/content/AccountWizard.xul 
chrome://castironthunderbirdclub/content/nntpwizard.xul
diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js
deleted file mode 100644
index 843cfbc..000
--- a/chrome/content/composeoverlay.js
+++ /dev/null
@@ -1,85 +0,0 @@
-var Ci = Components.interfaces;
-var Cc = Components.classes;
-
-function torbirdyTextRandom() {
-  // Generate alphanumeric random numbers.
-  var inChars = 
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-=_";
-  var randomString = '';
-  for (var i = 0; i < 10; i++) {
-var num = Math.floor(Math.random() * inChars.length);
-randomString += inChars.substring(num, num+1);
-  }
-  return randomString;
-}
-
-function torbirdyHexString(charCode) {
-  return ("0" + charCode.toString(16)).slice(-2);
-}
-
-function send_event_handler(event) {
-  var msgcomposeWindow = document.getElementById("msgcomposeWindow");
-  var msg_type = msgcomposeWindow.getAttribute("msgtype");
-
-  var prefs = Cc["@mozilla.org/preferences-service;1"]
- .getService(Ci.nsIPrefBranch);
-
-  var is_custom_msg_id = prefs.getBoolPref("mailnews.custom_message_id");
-
-  if (is_custom_msg_id) {
-// Only continue if this is an actual send event.
-if (!(msg_type == nsIMsgCompDeliverMode.Now || msg_type == 
nsIMsgCompDeliverMode.Later))
-  return;
-
-// We now generate the custom message-ID based on the approach described 
in tagnaq's paper.
-var to_field = gMsgCompose.compFields.to;
-var cc_field = gMsgCompose.compFields.cc;
-var subject_field = gMsgCompose.compFields.subject;
-
-// When a message is forwarded, remove the references header.
-// See https://trac.torproject.org/projects/tor/ticket/6392
-if (gMsgCompose.type === 3 || gMsgCompose.type === 4) {
-  gMsgCompose.compFields.references = '';
-}
-
-// Get the text of the body.
-

[tor-commits] [torbirdy/develop] Reflect TorBirdy's state in UI after uninstall/disable (#10683)

2016-11-24 Thread sukhbir 
commit 26a0def110411e65f0abad893533a705d30a4424
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 16 17:28:35 2016 -0400

Reflect TorBirdy's state in UI after uninstall/disable (#10683)

When TorBirdy is uninstalled or disabled, the status bar text and colour is
updated to reflect TorBirdy's current state. Prior to this commit, if a user
uninstalled/disabled TorBirdy, the status bar text would still say "TorBirdy
Enabled". Now the status bar is updated as TorBirdy's state changes to avoid
confusing the user.
---
 chrome/content/overlay.js|  2 +-
 chrome/locale/en/torbirdy.properties |  1 +
 components/torbirdy.js   | 31 +--
 install.rdf  |  2 +-
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index f8b1051..1f72c9d 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -67,7 +67,7 @@
 prefs.setBoolPref("extensions.torbirdy.whonix_run", false);
   }
   else {
-myPanel.label = strbundle.getString("torbirdy.enabled.disabled");
+myPanel.label = strbundle.getString("torbirdy.disabled");
 myPanel.style.color = "red";
   }
 }
diff --git a/chrome/locale/en/torbirdy.properties 
b/chrome/locale/en/torbirdy.properties
index 2e01136..4f645eb 100644
--- a/chrome/locale/en/torbirdy.properties
+++ b/chrome/locale/en/torbirdy.properties
@@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy Enabled:Custom Proxy
 torbirdy.enabled.torification=TorBirdy Enabled:Transparent Torification
 torbirdy.enabled.whonix=TorBirdy Enabled:Whonix
 torbirdy.disabled=TorBirdy:Disabled!
+torbirdy.enabled=TorBirdy:Enabled
 
 torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration 
wizard to protect your anonymity.\n\nThe recommended security settings for %S 
have been set.\n\nYou can now configure the other account settings manually.
 
diff --git a/components/torbirdy.js b/components/torbirdy.js
index ead2508..eb64df6 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -1,9 +1,8 @@
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
+var { interfaces: Ci, utils: Cu, classes: Cc } = Components;
 
-var Ci = Components.interfaces;
-var Cc = Components.classes;
-var Cr = Components.results;
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/imXPCOMUtils.jsm");
+Cu.import("resource://gre/modules/AddonManager.jsm");
 
 var SERVICE_CTRID = "@torproject.org/torbirdy;1";
 var SERVICE_ID= Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}");
@@ -14,6 +13,10 @@ var kPrefBranch = "extensions.torbirdy.custom.";
 var kRestoreBranch  = "extensions.torbirdy.restore.";
 var kTorBirdyBranch = "extensions.torbirdy.";
 
+XPCOMUtils.defineLazyGetter(this, "_", () =>
+  l10nHelper("chrome://castironthunderbirdclub/locale/torbirdy.properties")
+);
+
 // Default preference values for TorBirdy.
 // These preferences values will be "enforced": even if the user decides to
 // change the preferences listed below, they will be reset to the TorBirdy
@@ -380,7 +383,7 @@ var TorBirdyOldPrefs = [
 // is rounded down to the nearest minute.
 function sanitizeDateHeaders() {
   // Import the jsmime module that is used to generate mail headers.
-  let { jsmime } = Components.utils.import("resource:///modules/jsmime.jsm");
+  let { jsmime } = Cu.import("resource:///modules/jsmime.jsm");
   // Inject our own structured encoder to the default header emitter,
   // to override the default Date encoder with a rounded-down version.
   jsmime.headeremitter.addStructuredEncoder("Date", function (date) {
@@ -438,7 +441,22 @@ TorBirdy.prototype = {
   // This is a hack to cause Thunderbird to instantiate us ASAP!
   _xpcom_categories: [{ category: "profile-after-change"}, ],
 
+  onStateChange: function() {
+let panel = Cc['@mozilla.org/appshell/window-mediator;1']
+ .getService(Ci.nsIWindowMediator)
+ 
.getMostRecentWindow('mail:3pane').document.getElementById("torbirdy-my-panel");
+if (this._uninstall) {
+  panel.label = _("torbirdy.enabled");
+  panel.style.color = "green";
+}
+else {
+  panel.label = _("torbirdy.disabled");
+  panel.style.color = "red";
+}
+  },
+
   onUninstalling: function(addon, needsRestart) {
+this.onStateChange();
 if (addon.id == TB_ID) {
   dump("Nooo! TorBirdy uninstall requested\n");
   this._uninstall = true;
@@ -447,6 +465,7 @@ TorBirdy.prototype = {
   },

[tor-commits] [torbirdy/develop] Update comment for last commit

2016-11-24 Thread sukhbir 
commit b18407669b898a091706485738f9523da1d95508
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu May 19 09:55:39 2016 -0400

Update comment for last commit
---
 components/torbirdy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index a113323..9c930e8 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -351,7 +351,7 @@ var TorBirdyPrefs = {
   // Disable downloadable fonts.
   "gfx.downloadable_fonts.enabled": false,
 
-  // Disable remote images.
+  // Disable third-party images.
   "permissions.default.image": 3,
 
   /*



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update translations

2016-11-24 Thread sukhbir 
commit da021937c5b1daf8766821fa97456f7afaff80a7
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Jun 8 04:28:09 2016 -0400

Update translations
---
 chrome/locale/ar/torbirdy.dtd   |  5 ---
 chrome/locale/ar/torbirdy.properties|  3 +-
 chrome/locale/ca/torbirdy.dtd   | 27 +++
 chrome/locale/ca/torbirdy.properties|  3 +-
 chrome/locale/cs/torbirdy.dtd   |  5 ---
 chrome/locale/cs/torbirdy.properties|  3 +-
 chrome/locale/da/torbirdy.dtd   |  5 ---
 chrome/locale/da/torbirdy.properties|  3 +-
 chrome/locale/de/torbirdy.dtd   | 25 ++
 chrome/locale/de/torbirdy.properties|  3 +-
 chrome/locale/el/torbirdy.dtd   |  7 +---
 chrome/locale/el/torbirdy.properties|  3 +-
 chrome/locale/en-GB/torbirdy.dtd|  5 ---
 chrome/locale/en-GB/torbirdy.properties |  3 +-
 chrome/locale/es/torbirdy.dtd   |  5 ---
 chrome/locale/es/torbirdy.properties|  3 +-
 chrome/locale/eu/torbirdy.dtd   |  5 ---
 chrome/locale/eu/torbirdy.properties|  3 +-
 chrome/locale/fr/torbirdy.dtd   | 11 ++-
 chrome/locale/fr/torbirdy.properties| 19 +--
 chrome/locale/he/torbirdy.dtd   |  5 ---
 chrome/locale/he/torbirdy.properties|  3 +-
 chrome/locale/hu/torbirdy.dtd   |  9 ++---
 chrome/locale/hu/torbirdy.properties|  5 ++-
 chrome/locale/id/torbirdy.dtd   | 27 +++
 chrome/locale/id/torbirdy.properties|  3 +-
 chrome/locale/it/torbirdy.dtd   |  5 ---
 chrome/locale/it/torbirdy.properties|  3 +-
 chrome/locale/ko/torbirdy.dtd   | 17 --
 chrome/locale/ko/torbirdy.properties|  3 +-
 chrome/locale/lv/torbirdy.dtd   |  5 ---
 chrome/locale/lv/torbirdy.properties|  3 +-
 chrome/locale/nb/torbirdy.dtd   | 31 --
 chrome/locale/nb/torbirdy.properties|  7 ++--
 chrome/locale/nl/torbirdy.dtd   | 11 ++-
 chrome/locale/nl/torbirdy.properties|  5 ++-
 chrome/locale/pa/torbirdy.dtd   |  5 ---
 chrome/locale/pa/torbirdy.properties|  3 +-
 chrome/locale/pl/torbirdy.dtd   |  5 ---
 chrome/locale/pl/torbirdy.properties|  3 +-
 chrome/locale/pt-BR/torbirdy.dtd|  9 ++---
 chrome/locale/pt-BR/torbirdy.properties |  5 ++-
 chrome/locale/pt/torbirdy.dtd   | 11 ++-
 chrome/locale/pt/torbirdy.properties|  3 +-
 chrome/locale/ro/torbirdy.dtd   |  5 ---
 chrome/locale/ro/torbirdy.properties|  3 +-
 chrome/locale/ru/torbirdy.dtd   | 17 --
 chrome/locale/ru/torbirdy.properties|  3 +-
 chrome/locale/sk/torbirdy.dtd   |  5 ---
 chrome/locale/sk/torbirdy.properties|  3 +-
 chrome/locale/sl/torbirdy.dtd   |  7 +---
 chrome/locale/sl/torbirdy.properties|  3 +-
 chrome/locale/sr/torbirdy.dtd   |  6 
 chrome/locale/sr/torbirdy.properties|  3 +-
 chrome/locale/sv/torbirdy.dtd   |  5 ---
 chrome/locale/sv/torbirdy.properties|  3 +-
 chrome/locale/tr/torbirdy.dtd   | 58 +++--
 chrome/locale/tr/torbirdy.properties| 23 +++--
 chrome/locale/uk/torbirdy.dtd   |  5 ---
 chrome/locale/uk/torbirdy.properties|  3 +-
 60 files changed, 151 insertions(+), 333 deletions(-)

diff --git a/chrome/locale/ar/torbirdy.dtd b/chrome/locale/ar/torbirdy.dtd
index e5924e2..5a05511 100644
--- a/chrome/locale/ar/torbirdy.dtd
+++ b/chrome/locale/ar/torbirdy.dtd
@@ -19,7 +19,6 @@
 
 
 
-
 
 
 
@@ -37,8 +36,6 @@
 
 
 
-
-
 
 
 
@@ -47,8 +44,6 @@
 
 
 
-
-
 
 
 
diff --git a/chrome/locale/ar/torbirdy.properties 
b/chrome/locale/ar/torbirdy.properties
index 8b9d7b3..deb3802 100644
--- a/chrome/locale/ar/torbirdy.properties
+++ b/chrome/locale/ar/torbirdy.properties
@@ -6,6 +6,7 @@ torbirdy.enabled.custom=توربيردي مُفعل: 
بروكسي مخصصه
 torbirdy.enabled.torification=توربيردي مُفعل: 
توريفيكيتشون ضمني
 torbirdy.enabled.whonix=توربيردي مُفعل: Whonix
 torbirdy.disabled=توربيردي: معطل!
+torbirdy.enabled=TorBirdy:Enabled
 
 torbirdy.email.prompt=توربيردي عطل التكوين التلقائي 
لثندربيرد لحماية خصوصيتك.\n تم ضبط إعدادات 
الأمان الموصى بها لـ %S.\nالان يمكنك تغيير 
تكوين إعدادات الحساب الاخر يدوياً.
 
@@ -13,7 +14,5 @@ torbirdy.email.advanced=الرجاء الملاحظة ان 
تغير الإعدا
 torbirdy.email.advanced.nextwarning=اظهار هذا التحذير في 
المرة القادمة
 torbirdy.email.advanced.title=الإعدادات المتقدمة 
لتوربيردي
 
-torbirdy.restart=يجب أن تعيد تشغيل ثاندربيرد حتي 
تأخذ تعديلاتك علي إعدادات التوقيت فاعليتها.
-
 torbirdy.firstrun=انت الان تعمل بتوربيردي.\n\nللم
ساعدة على Ø­Ù

[tor-commits] [torbirdy/develop] Set secure defaults for outgoing servers (#19330)

2016-11-24 Thread sukhbir 
commit 3fef66ce5e06830ead85d4c955908e0f6dc8c56d
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Jun 7 12:19:27 2016 -0400

Set secure defaults for outgoing servers (#19330)
---
 components/torbirdy.js | 25 +
 1 file changed, 25 insertions(+)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index fa1aa6b..1c71bf0 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -3,6 +3,7 @@ var { interfaces: Ci, utils: Cu, classes: Cc } = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/imXPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
 
 var SERVICE_CTRID = "@torproject.org/torbirdy;1";
 var SERVICE_ID= Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}");
@@ -687,6 +688,30 @@ TorBirdy.prototype = {
 // Set the authentication to normal, connection is already encrypted.
 account.authMethod = 3;
   }
+
+  // We need to set safe defaults for the outgoing servers in case there
+  // are accounts using insecure configurations. One other way way of
+  // accessing the server list can be through nsIMsgIdentity but multiple
+  // identities can share the same server so fetching the preference value
+  // mail.smtpservers seems a better way to do it.
+  let smtpAccounts = this.prefs.getCharPref("mail.smtpservers").split(",");
+  let smtpPrefs = [
+["mail.smtpserver.%smtp%.port", 465], // SMTP over TLS
+["mail.smtpserver.%smtp%.authMethod", 3], // Normal password
+["mail.smtpserver.%smtp%.try_ssl", 3], // SSL/TLS
+  ];
+  for (let i = 0; i < smtpAccounts.length; i++) {
+for each (var [pref_template, value] in smtpPrefs) {
+  let pref = pref_template.replace("%smtp%", smtpAccounts[i]);
+  if (this.prefs.prefHasUserValue(pref)) {
+let currentPref = Preferences.get(pref);
+// Save the values so that we can restore them later.
+Preferences.set(kRestoreBranch + pref, currentPref);
+TorBirdyOldPrefs.push(pref);
+Preferences.set(pref, value);
+  }
+}
+  }
 }
 this.prefs.setBoolPref("extensions.torbirdy.first_run", false);
   },



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Merge branch 'master' into post-secure-autoconfig

2016-11-24 Thread sukhbir 
commit 188fbd679a85dc8909bf0eff46b840112a2bd54b
Merge: 89bf536 caaf2b5
Author: Ulrike Uhlig 
Date:   Wed May 4 13:00:23 2016 +0200

Merge branch 'master' into post-secure-autoconfig

 Makefile  |  6 ++
 chrome/content/emailwizard.js |  4 
 components/torbirdy.js| 22 +-
 defaults/preferences/prefs.js |  1 +
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --cc chrome/content/emailwizard.js
index 30024ac,123753b..8218c1b
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@@ -133,11 -136,17 +133,15 @@@ if(!org.torbirdy.emailwizard) org.torbi
};
  
pub.onLoad = function() {
 -if (disableWizard) {
 +if (disableAutoConfiguration) {
document.getElementById("torbirdy-protocol-box").collapsed = true;
 -  document.getElementById("provisioner_button").disabled = false;
 -  document.getElementById("provisioner_button").hidden = false;
 -} else {
 -  document.getElementById("provisioner_button").disabled = true;
 -  document.getElementById("provisioner_button").hidden = true;
  }
 +document.getElementById("provisioner_button").disabled = true;
 +document.getElementById("provisioner_button").hidden = true;
++
+ // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and 
prefs.js.
+ var selectProtocol = 
prefs.getIntPref("extensions.torbirdy.defaultprotocol")
+ document.getElementById("torbirdy-protocol").selectedIndex = 
selectProtocol;
};
  
return pub;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Bug 6314: Ensure Date header uses UTC string

2016-11-24 Thread sukhbir 
commit 230ba97882424d35e12794c45db7c6715fe753f9
Author: Arthur Edelstein 
Date:   Thu Jun 16 16:49:58 2016 -0700

Bug 6314: Ensure Date header uses UTC string
---
 components/torbirdy.js | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 84ea9c7..d4743e0 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -392,9 +392,11 @@ function sanitizeDateHeaders() {
 let roundedDate = new Date(date.getTime());
 // Round down to the nearest minute.
 roundedDate.setSeconds(0);
-// Use the headeremitter's addDate function to format it properly.
-// `this` magically refers to the headeremitter object.
-this.addDate(roundedDate);
+// Use the headeremitter's internal `addText` function to inject the
+// Date header. `this` magically refers to the headeremitter object.
+// Date.toUTCString() produces an RFC 1123-formatted date string.
+// We replace the "GMT" symbol with "+" because it is preferred.
+this.addText(roundedDate.toUTCString().replace(/GMT$/, "+"), false);
   });
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Secure NNTP settings on account creation (#7847)

2016-11-24 Thread sukhbir 
commit 0f1d01af3ab0572f4ffc25bb67c1b03afc9591f5
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Fri May 13 18:26:10 2016 -0400

Secure NNTP settings on account creation (#7847)
---
 chrome.manifest   |  1 +
 chrome/content/nntpwizard.js  | 90 +++
 chrome/content/nntpwizard.xul | 10 +
 3 files changed, 101 insertions(+)

diff --git a/chrome.manifest b/chrome.manifest
index 431b4c9..33b0a10 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -4,6 +4,7 @@ overlay chrome://messenger/content/messenger.xul 
chrome://castironthunderbirdclu
 overlay chrome://messenger/content/messengercompose/messengercompose.xul 
chrome://castironthunderbirdclub/content/composeoverlay.xul
 overlay chrome://messenger/content/accountcreation/emailWizard.xul 
chrome://castironthunderbirdclub/content/emailwizard.xul
 overlay chrome://messenger-newsblog/content/feedAccountWizard.xul 
chrome://castironthunderbirdclub/content/feedwizard.xul
+overlay chrome://messenger/content/AccountWizard.xul 
chrome://castironthunderbirdclub/content/nntpwizard.xul
 
 component {ebd85413-18c8-4265-a708-a8890ec8d1ed} components/torbirdy.js
 contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed}
diff --git a/chrome/content/nntpwizard.js b/chrome/content/nntpwizard.js
new file mode 100644
index 000..90051bb
--- /dev/null
+++ b/chrome/content/nntpwizard.js
@@ -0,0 +1,90 @@
+Components.utils.import("resource://gre/modules/Preferences.jsm");
+
+if (!org) var org = {};
+if (!org.torbirdy) org.torbirdy = {};
+
+if (!org.torbirdy.nntpwizard) org.torbirdy.nntpwizard = new function() {
+  var pub = {};
+
+  pub.fixNntpPort = function(account) {
+let key = account.incomingServer.key;
+
+let pref_spec = [
+  // Set the port to 563 and connection security to SSL/TLS (NNTPS).
+  ['mail.server.%serverkey%.port', 563],
+  ['mail.server.%serverkey%.socketType', 3]
+];
+
+for each (var [pref_template, value] in pref_spec) {
+  let pref = pref_template.replace("%serverkey%", key);
+  Preferences.set(pref, value);
+}
+  };
+
+  // This is from mailnews/base/prefs/content/AccountWizard.xul : 
FinishAccount().
+  FinishAccount = function() {
+try {
+  var pageData = GetPageData();
+
+  var accountData= gCurrentAccountData;
+
+  if (!accountData)
+  {
+accountData = new Object;
+// Time to set the smtpRequiresUsername attribute
+if (!serverIsNntp(pageData))
+  accountData.smtpRequiresUsername = true;
+  }
+
+  // we may need local folders before account is "Finished"
+  // if it's a pop3 account which defers to Local Folders.
+  verifyLocalFoldersAccount();
+
+  PageDataToAccountData(pageData, accountData);
+
+  FixupAccountDataForIsp(accountData);
+
+  // we might be simply finishing another account
+  if (!gCurrentAccount)
+gCurrentAccount = createAccount(accountData);
+
+  // transfer all attributes from the accountdata
+  finishAccount(gCurrentAccount, accountData);
+
+  setupCopiesAndFoldersServer(gCurrentAccount, 
getCurrentServerIsDeferred(pageData), accountData);
+
+  if (gCurrentAccount.incomingServer.canBeDefaultServer)
+EnableCheckMailAtStartUpIfNeeded(gCurrentAccount);
+
+  if (!document.getElementById("downloadMsgs").hidden) {
+// skip the default biff, we will load messages manually if needed
+window.opener.gLoadStartFolder = false;
+if (document.getElementById("downloadMsgs").checked) {
+  window.opener.gNewAccountToLoad = gCurrentAccount; // load messages 
for new POP account
+}
+  }
+
+  pub.fixNntpPort(gCurrentAccount);
+
+  // in case we crash, force us a save of the prefs file NOW
+  try {
+MailServices.accounts.saveAccountInfo();
+  }
+  catch (ex) {
+dump("Error saving account info: " + ex + "\n");
+  }
+  window.close();
+  if(top.okCallback)
+  {
+var state = true;
+//dump("finish callback");
+top.okCallback(state);
+  }
+}
+catch(ex) {
+  dump("FinishAccount failed, " + ex +"\n");
+}
+  };
+
+  return pub;
+};
diff --git a/chrome/content/nntpwizard.xul b/chrome/content/nntpwizard.xul
new file mode 100644
index 000..c9ccea1
--- /dev/null
+++ b/chrome/content/nntpwizard.xul
@@ -0,0 +1,10 @@
+
+
+
+
+http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul;>
+
+  
+
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Add overlay to disable automatic checking and fetching of RSS feeds (#19031)

2016-11-24 Thread sukhbir 
commit 0968621f307da8a9a0fcf6de9b30fb757169ccfe
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed May 11 21:32:14 2016 -0400

Add overlay to disable automatic checking and fetching of RSS feeds (#19031)

To disable checking of new articles on startup and after a fixed interval 
(100
minutes as defined in FeedUtils.jsm), add an overlay which disables both 
these
settings after a new RSS account is created. This is similar to what we are
doing with the manual email configuration wizard.
---
 chrome.manifest   |  1 +
 chrome/content/feedwizard.js  | 43 +++
 chrome/content/feedwizard.xul | 10 ++
 3 files changed, 54 insertions(+)

diff --git a/chrome.manifest b/chrome.manifest
index 78f1183..431b4c9 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -3,6 +3,7 @@ content castironthunderbirdclub chrome/content/
 overlay chrome://messenger/content/messenger.xul 
chrome://castironthunderbirdclub/content/overlay.xul 
application={3550f703-e582-4d05-9a08-453d09bdfdc6}
 overlay chrome://messenger/content/messengercompose/messengercompose.xul 
chrome://castironthunderbirdclub/content/composeoverlay.xul
 overlay chrome://messenger/content/accountcreation/emailWizard.xul 
chrome://castironthunderbirdclub/content/emailwizard.xul
+overlay chrome://messenger-newsblog/content/feedAccountWizard.xul 
chrome://castironthunderbirdclub/content/feedwizard.xul
 
 component {ebd85413-18c8-4265-a708-a8890ec8d1ed} components/torbirdy.js
 contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed}
diff --git a/chrome/content/feedwizard.js b/chrome/content/feedwizard.js
new file mode 100644
index 000..07b01bc
--- /dev/null
+++ b/chrome/content/feedwizard.js
@@ -0,0 +1,43 @@
+Components.utils.import("resource://gre/modules/Preferences.jsm");
+
+if (!org) var org = {};
+if (!org.torbirdy) org.torbirdy = {};
+
+if (!org.torbirdy.feedwizard) org.torbirdy.feedwizard = new function() {
+  var pub = {};
+
+  pub.fixFeedAccount = function(account) {
+let accountKey = account.incomingServer.key;
+
+let pref_spec = [
+  ['mail.server.%serverkey%.check_new_mail', false],
+  ['mail.server.%serverkey%.login_at_startup', false]
+];
+
+for each (var [pref_template, value] in pref_spec) {
+let pref = pref_template.replace("%serverkey%", accountKey);
+Preferences.set(pref, value);
+}
+  };
+
+  // From 
comm-release/mailnews/extensions/newsblog/content/feedAccountWizard.js : 
onFinish().
+  // We need to disable automatic checking of articles on startup and every X
+  // (100 is the default) minutes. Since these values are in FeedUtils.jsm, we
+  // use this overlay, create the account, and then apply our settings.
+  FeedAccountWizard.onFinish = function() {
+let account = FeedUtils.createRssAccount(this.accountName);
+if ("gFolderTreeView" in window.opener.top)
+  // Opened from 3pane File->New or Appmenu New Message, or
+  // Account Central link.
+  
window.opener.top.gFolderTreeView.selectFolder(account.incomingServer.rootMsgFolder);
+else if ("selectServer" in window.opener)
+  // Opened from Account Settings.
+  window.opener.selectServer(account.incomingServer);
+
+// Now apply the settings.
+pub.fixFeedAccount(account);
+window.close();
+  };
+
+  return pub;
+};
diff --git a/chrome/content/feedwizard.xul b/chrome/content/feedwizard.xul
new file mode 100644
index 000..2f3c935
--- /dev/null
+++ b/chrome/content/feedwizard.xul
@@ -0,0 +1,10 @@
+
+
+
+
+http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul;>
+
+  
+
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Make TorBirdy XPI deterministic (#15459)

2016-11-24 Thread sukhbir 
commit caaf2b593ba2a116ac8f63416bb311bcdd140ee2
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue May 3 15:29:52 2016 -0400

Make TorBirdy XPI deterministic (#15459)
---
 Makefile | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 96214b1..48c661c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
 SHELL := /bin/bash
 VERSION := $(shell cat install.rdf|grep ''|cut -d\> -f2|cut -d\< 
-f1)
 
+FAKETIME := 2101
+
 make-xpi:
zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x 
"ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x 
"README.RELEASE"
 
+make-reproducible:
+   find . -print0 | xargs -0 touch -t $(FAKETIME)
+   zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x 
"patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x 
"import-translations.sh" -x "README.RELEASE" -x *.git*
+
 clean:
rm -f ../torbirdy-$(VERSION).xpi
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Replace 'var' with 'let' for iterations

2016-11-24 Thread sukhbir 
commit de8d9fa2964132f657f03d3ba27f3ea317c39eba
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 30 06:19:48 2016 -0400

Replace 'var' with 'let' for iterations
---
 chrome/content/preferences.js | 10 +-
 components/torbirdy.js| 26 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 682b367..c843d3c 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -77,7 +77,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
 
   pub.clearCustomPrefs = function() {
 var customPrefs = pub.torBirdyPref.getChildList("", {});
-for (var i = 0; i < customPrefs.length; i++) {
+for (let i = 0; i < customPrefs.length; i++) {
   pub.prefs.clearUserPref(pub.customBranch + customPrefs[i]);
 }
   };
@@ -131,7 +131,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
 
 var accountLength = accounts.length;
 
-for (var i = 0; i < accountLength; i++) {
+for (let i = 0; i < accountLength; i++) {
   var account = accounts.queryElementAt(i, 
Components.interfaces.nsIMsgAccount).incomingServer;
 
   var name = account.prettyName;
@@ -149,7 +149,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   // For email accounts, configure accordingly.
   var sAccount = null;
   var account = pub.getAccount();
-  for (var i = 0; i < account.length; i++) {
+  for (let i = 0; i < account.length; i++) {
 if (account[i].key === pub.mailAccount.value) {
   sAccount = i;
 }
@@ -324,14 +324,14 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   var accounts = pub.getAccount();
   if (pub.fetchAllMails.checked) {
 pub.prefs.setBoolPref(pub.prefBranch + 'fetchall', true);
-for (var i = 0; i < accounts.length; i++) {
+for (let i = 0; i < accounts.length; i++) {
   accounts[i].loginAtStartUp = true;
   accounts[i].doBiff = true;
 }
   }
   else {
 pub.prefs.setBoolPref(pub.prefBranch + 'fetchall', false);
-for (var i = 0; i < accounts.length; i++) {
+for (let i = 0; i < accounts.length; i++) {
   accounts[i].loginAtStartUp = false;
   accounts[i].doBiff = false;
 }
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 9c930e8..fa1aa6b 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -480,13 +480,13 @@ TorBirdy.prototype = {
   resetUserPrefs: function() {
 dump("Resetting user preferences to default\n");
 // Clear the Thunderbird preferences we changed.
-for (var each in TorBirdyPrefs) {
+for (let each in TorBirdyPrefs) {
   this.prefs.clearUserPref(each);
 }
 
 // Restore the older proxy preferences that were set prior to TorBirdy's 
install.
 dump("Restoring proxy settings\n");
-for (var i = 0; i < TorBirdyOldPrefs.length; i++) {
+for (let i = 0; i < TorBirdyOldPrefs.length; i++) {
   var oldPref = TorBirdyOldPrefs[i];
   var setValue = kRestoreBranch + oldPref;
   var type = this.prefs.getPrefType(setValue);
@@ -502,14 +502,14 @@ TorBirdy.prototype = {
 }
 
 // Enable plugins.
-for(var i = 0; i < this.plugins.length; i++) {
+for(let i = 0; i < this.plugins.length; i++) {
 this.plugins[i].disabled = false;
 }
 
 // Now clear all TorBirdy preferences.
 var clearPrefs = Cc["@mozilla.org/preferences-service;1"]
  
.getService(Ci.nsIPrefService).getBranch(kTorBirdyBranch).getChildList("", {});
-for (var i = 0; i < clearPrefs.length; i++) {
+for (let i = 0; i < clearPrefs.length; i++) {
 this.prefs.clearUserPref(kTorBirdyBranch + clearPrefs[i]);
 }
   },
@@ -517,7 +517,7 @@ TorBirdy.prototype = {
   setPrefs: function() {
 // If custom values are set for specific preferences, override the 
defaults with them.
 // For each preference, get the type and then set the property.
-for (var i = 0; i < this.customPrefs.length; i++) {
+for (let i = 0; i < this.customPrefs.length; i++) {
   var typePref = this.prefs.getPrefType(this.customPrefs[i]);
   // String.
   if (typePref === 32) {
@@ -534,7 +534,7 @@ TorBirdy.prototype = {
   TorBirdyPrefs[this.customPrefs[i]] = value;
 }
 
-for (var each in TorBirdyPrefs) {
+for (let each in TorBirdyPrefs) {
   if (typeof TorBirdyPrefs[each] === "boolean") {
 this.prefs.setBoolPref(each, TorBirdyPrefs[each]);
   }
@@ -554,7 +554,7 @@ TorBirdy.prototype = {
   // First copy TorBirdyPrefs to TorBirdyOldPrefs.
   TorBirdyOldPrefs.push.apply(TorBirdyOldPrefs, 
Object.keys(TorBirdyPrefs));
 
-  for (var i = 0; i < TorBirdyOldPrefs.length; i++)

[tor-commits] [torbirdy/develop] Merge pull request #30 from u451f/post-secure-autoconfig

2016-11-24 Thread sukhbir 
commit 1da072c0051b4ca05ec667ed516ce8edcb8186fe
Merge: caaf2b5 188fbd6
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed May 4 13:14:59 2016 -0400

Merge pull request #30 from u451f/post-secure-autoconfig

Secure autoconfiguration

 chrome/content/emailwizard.js  | 111 -
 chrome/content/emailwizard.xul |   2 +-
 chrome/content/preferences.js  |  40 +--
 components/torbirdy.js |  10 +++-
 4 files changed, 75 insertions(+), 88 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Improve variable name.

2016-11-24 Thread sukhbir 
commit a229be9aef54736b38ff224b6d7283e5fade3a42
Author: anonym 
Date:   Wed Mar 9 20:18:35 2016 +0100

Improve variable name.
---
 chrome/content/emailwizard.js | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index d5adc85..fc2d48e 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -6,7 +6,10 @@ if (!org.torbirdy) org.torbirdy = {};
 if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
   var pub = {};
 
-  var disableWizard = !Preferences.get("extensions.torbirdy.emailwizard", 
false);
+  var disableAutoConfiguration = false;
+  if (Preferences.get("extensions.torbirdy.emailwizard", false)) {
+disableAutoConfiguration = true;
+  }
 
   fixupTorbirdySettingsOnNewAccount = function(account) {
 var idkey = account.defaultIdentity.key;
@@ -37,7 +40,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
   }
 
   pub.adjustAutoWizard = function() {
-if (!disableWizard) {
+if (!disableAutoConfiguration) {
   var realname = document.getElementById("realname").value;
   var email = document.getElementById("email").value;
   var password = document.getElementById("password").value;
@@ -134,7 +137,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   };
 
   pub.onLoad = function() {
-if (disableWizard) {
+if (disableAutoConfiguration) {
   document.getElementById("torbirdy-protocol-box").collapsed = true;
 }
 document.getElementById("provisioner_button").disabled = true;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Refactor.

2016-11-24 Thread sukhbir 
commit ead042821ece6420cecdd5efc40e21c4e4a9d03d
Author: anonym 
Date:   Wed Mar 9 19:30:39 2016 +0100

Refactor.
---
 chrome/content/emailwizard.js | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index baf1ef5..ec73113 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/Preferences.jsm");
+
 if (!org) var org = {};
 if (!org.torbirdy) org.torbirdy = {};
 
@@ -17,28 +19,26 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
 var serverkey = account.incomingServer.key;
 var protocol = account.incomingServer.type;
 
+var pref_spec = [
+['mail.server.%serverkey%.check_new_mail', false],
+['mail.server.%serverkey%.login_at_startup', false]
+];
+
 // Make sure that drafts are saved to Local Folders if it is an IMAP 
account.
 if (protocol === "imap") {
-  var draftFolder = 'mail.identity.%idkey%.draft_folder';
-  var draftFolderPref = draftFolder.replace("%idkey%", idkey);
-  prefs.setCharPref(draftFolderPref, 
"mailbox://nobody@Local%20Folders/Drafts");
+pref_spec.push(['mail.identity.%idkey%.draft_folder',
+'mailbox://nobody@Local%20Folders/Drafts']);
 }
 
-// Set check_new_mail to false. We can't do this through the account 
setup, so let's do it here.
-var checkNewMail = 'mail.server.%serverkey%.check_new_mail';
-var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey);
-prefs.setBoolPref(checkNewMailPref, false);
-
-// Do not check for new messages at startup.
-var loginAtStartup = 'mail.server.%serverkey%.login_at_startup';
-var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey);
-prefs.setBoolPref(loginAtStartupPref, false);
-
-// Do not automatically download new messages.
+// Do not automatically download new messages in POP accounts.
 if (protocol === "pop3") {
-  var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff';
-  var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", 
serverkey);
-  prefs.setBoolPref(downloadOnBiffPref, false);
+pref_spec.push(['mail.server.%serverkey%.download_on_biff', false]);
+}
+
+for each (var [pref_template, value] in pref_spec) {
+var pref = pref_template.replace("%idkey%", idkey);
+pref = pref.replace("%serverkey%", serverkey);
+Preferences.set(pref, value);
 }
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Disable HTML for RSS feeds

2016-11-24 Thread sukhbir 
commit 174cd106b9708d22c9825d6611b13d1f22d7397a
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed May 11 15:34:48 2016 -0400

Disable HTML for RSS feeds
---
 components/torbirdy.js | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 4f83513..2740c64 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -231,8 +231,11 @@ const TorBirdyPrefs = {
   // Force GnuPG to use SHA512.
   "extensions.enigmail.mimeHashAlgorithm": 5,
 
-  // Prefer plain text for RSS.
+  // RSS.
   "rss.display.prefer_plaintext": true,
+  // These are similar to the mailnews.* settings.
+  "rss.display.disallow_mime_handlers": 3,
+  "rss.display.html_as": 1,
 
   // Override the user agent by setting it to an empty string.
   "general.useragent.override": "",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Allow changing the default protocol (#15879)

2016-11-24 Thread sukhbir 
commit 04fd3d875491a0fdcc598c43c53edc0eb384e4cf
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 2 14:49:52 2016 -0400

Allow changing the default protocol (#15879)
---
 chrome/content/emailwizard.js | 3 +++
 defaults/preferences/prefs.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 2f2a6a7..123753b 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -144,6 +144,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   document.getElementById("provisioner_button").disabled = true;
   document.getElementById("provisioner_button").hidden = true;
 }
+// 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and 
prefs.js.
+var selectProtocol = 
prefs.getIntPref("extensions.torbirdy.defaultprotocol")
+document.getElementById("torbirdy-protocol").selectedIndex = 
selectProtocol;
   };
 
   return pub;
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index eec4539..8b43562 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -10,3 +10,4 @@ pref("extensions.torbirdy.whonix_run", true);
 pref("extensions.torbirdy.info_run", false);
 pref("extensions.torbirdy.emailwizard", false);
 pref("extensions.torbirdy.fetchall", false);
+pref("extensions.torbirdy.defaultprotocol", 0); // 0 - POP3, 1 - IMAP



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Set calender timezone to UTC

2016-11-24 Thread sukhbir 
commit ff0bf3cad0d223342760c3d0275073f6c3bc527b
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu May 12 17:52:40 2016 -0400

Set calender timezone to UTC
---
 components/torbirdy.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 2740c64..238c089 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -227,7 +227,6 @@ const TorBirdyPrefs = {
 
   // The default key server should be a hidden service and this is the only 
known one (it's part of the normal SKS network)
   "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",
-
   // Force GnuPG to use SHA512.
   "extensions.enigmail.mimeHashAlgorithm": 5,
 
@@ -301,7 +300,9 @@ const TorBirdyPrefs = {
 
   // Mozilla Lightning.
   "calendar.useragent.extra": "",
-  "calendar.timezone.local": "",
+  // We have to set a timezone otherwise the system time is used. "UTC" or
+  // "GMT" is not an option so we set it to Europe/London.
+  "calendar.timezone.local": "Europe/London",
 
   // All preferences have been set: now enable TorBirdy.
   "extensions.torbirdy.protected": true,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Use Tor's SOCKSPort for Enigmail's keyserver configuration.

2016-11-24 Thread sukhbir 
commit 89bf536f14872660815886f480cc88902904d4aa
Author: anonym 
Date:   Fri Mar 18 17:42:16 2016 +0100

Use Tor's SOCKSPort for Enigmail's keyserver configuration.

It's not necessarily the case that users have an HTTP proxy running on
port 8118, and if they do it may be a non-torified Privoxy instance.

Using the Tor SOCKSPort will always work, and be torified.
---
 chrome/content/preferences.js | 2 +-
 components/torbirdy.js| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index de77205..94ccb39 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -41,7 +41,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
 if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
   opts += "--throw-keyids ";
 }
-var proxy = "http-proxy=http://127.0.0.1:8118;;
+var proxy = "socks5h://127.0.0.1:9050";
 if (anonService === "jondo") {
   proxy = "http://127.0.0.1:4001;;
 }
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 2efcfec..06ae80c 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -223,7 +223,7 @@ const TorBirdyPrefs = {
   // We want to force UTF-8 
everywhere
   "--display-charset utf-8 " +
   // We want to ensure that 
Enigmail is proxy aware even when it runs gpg in a shell
-  "--keyserver-options 
http-proxy=http://127.0.0.1:8118 ",
+  "--keyserver-options 
http-proxy=socks5h://127.0.0.1:9050 ",
 
   // The default key server should be a hidden service and this is the only 
known one (it's part of the normal SKS network)
   "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Refactor.

2016-11-24 Thread sukhbir 
commit 7fc8da14e00d2e6d2436358ffd509e81527bdfa6
Author: anonym 
Date:   Fri Mar 18 16:51:09 2016 +0100

Refactor.
---
 chrome/content/preferences.js | 40 
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 1359f63..de77205 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -37,36 +37,20 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   };
 
   pub.setEnigmailPrefs = function(anonService) {
+var opts = "";
 if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
-  if (anonService === "tor") {
-return "--no-emit-version " +
-   "--no-comments " +
-   "--throw-keyids " +
-   "--display-charset utf-8 " +
-   "--keyserver-options 
no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118;;
-  }
-  if (anonService === "jondo") {
-return "--no-emit-version " +
-   "--no-comments " +
-   "--throw-keyids " +
-   "--display-charset utf-8 " +
-   "--keyserver-options 
no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001;;
-  }
-}
-else {
-  if (anonService === "tor") {
-return "--no-emit-version " +
-   "--no-comments " +
-   "--display-charset utf-8 " +
-   "--keyserver-options 
no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118;;
-  }
-  if (anonService === "jondo") {
-return "--no-emit-version " +
-   "--no-comments " +
-   "--display-charset utf-8 " +
-   "--keyserver-options 
no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:4001;;
-  }
+  opts += "--throw-keyids ";
 }
+var proxy = "http-proxy=http://127.0.0.1:8118;;
+if (anonService === "jondo") {
+  proxy = "http://127.0.0.1:4001;;
+}
+return opts +
+   "--no-emit-version " +
+   "--no-comments " +
+   "--display-charset utf-8 " +
+   "--keyserver-options 
no-auto-key-retrieve,no-try-dns-srv,http-proxy=" +
+   proxy;
   };
 
   pub.updateKeyserver = function(anonService) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update privacy settings and related preferences

2016-11-24 Thread sukhbir 
commit 2bdeffbbeedfdf382b33f0faaf6839427096544a
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 16 12:26:34 2016 -0400

Update privacy settings and related preferences
---
 components/torbirdy.js | 161 ++---
 1 file changed, 111 insertions(+), 50 deletions(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 238c089..ba8195e 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -25,12 +25,7 @@ const kTorBirdyBranch = "extensions.torbirdy.";
 // preferences dialog. See `preferences.js'.
 const TorBirdyPrefs = {
   "extensions.torbirdy.protected": false,
-  // When the preferences below have been set, then only enable TorBirdy.
-  // Generate our own custom time-independent message-ID.
-  "mailnews.custom_message_id": true,
-  "mailnews.header.custom_message_id": "",
-  // Remove the date header.
-  "mailnews.local_date_header_generation": false,
+  // When the preferences below have been set, enable TorBirdy.
 
   /*
 Network
@@ -38,6 +33,10 @@ const TorBirdyPrefs = {
 
   // Use a manual proxy configuration.
   "network.proxy.type": 1,
+  // https://bugs.torproject.org/10419
+  "network.proxy.no_proxies_on": "",
+  // Restrict TBB ports.
+  "network.security.ports.banned": "9050,9051,9150,9151",
   // Number of seconds to wait before attempting to recontact an unresponsive 
proxy server.
   "network.proxy.failover_timeout": 1800,
 
@@ -48,6 +47,8 @@ const TorBirdyPrefs = {
 
   // Set DNS proxying through SOCKS5.
   "network.proxy.socks_remote_dns": true,
+  // Disable DNS prefetching.
+  "network.dns.disablePrefetch": true,
 
   // https://lists.torproject.org/pipermail/tor-talk/2011-September/021398.html
   // "Towards a Tor-safe Mozilla Thunderbird"
@@ -62,8 +63,15 @@ const TorBirdyPrefs = {
 
   // Likely privacy violations
   // 
https://blog.torproject.org/blog/experimental-defense-website-traffic-fingerprinting
-  // https://trac.torproject.org/projects/tor/ticket/3914
+  // https://bugs.torproject.org/3914
   "network.http.pipelining": true,
+  "network.http.pipelining.aggressive": true,
+  "network.http.pipelining.maxrequests": 12,
+  "network.http.connection-retry-timeout": 0,
+  "network.http.max-persistent-connections-per-proxy": 256,
+  "network.http.pipelining.reschedule-timeout": 15000,
+  "network.http.pipelining.read-timeout": 6,
+
   // We do not fully understand the privacy issues of the SPDY protocol
   // We have no reason to believe that anyone would actually use it with
   // Thunderbird but we fail closed to keep users safe out of an abundance of
@@ -74,8 +82,10 @@ const TorBirdyPrefs = {
   // author Mike Perry.
   "network.http.pipelining.ssl": true,
   "network.http.proxy.pipelining": true,
-  "network.http.pipelining.maxrequests": 12,
-  "network.http.sendRefererHeader": 0,
+  "network.http.sendRefererHeader": 2,
+  // https://bugs.torproject.org/16673
+  "network.http.altsvc.enabled": false,
+  "network.http.altsvc.oe": false,
 
   // Disable proxy bypass issue.
   // Websockets have no use in Thunderbird over Tor; some versions of the
@@ -87,6 +97,9 @@ const TorBirdyPrefs = {
   "network.websocket.enabled": false,
   // Cookies are allowed, but not third-party cookies. For Gmail and Twitter.
   "network.cookie.cookieBehavior": 1,
+  // http://kb.mozillazine.org/Network.cookie.lifetimePolicy
+  // 2: cookie expires at the end of the session.
+  "network.cookie.lifetimePolicy": 2,
   // Disable link prefetching.
   "network.prefetch-next": false,
 
@@ -103,6 +116,7 @@ const TorBirdyPrefs = {
   // - OCSP servers may log information about a user as they use the internet
   // generally; it's everything we hate about CRLs and more
   "security.OCSP.enabled": 1,
+  "security.OCSP.GET.enabled": false,
   "security.OCSP.require": false,
   // Disable TLS Session Ticket.
   // See https://trac.torproject.org/projects/tor/ticket/4099
@@ -111,7 +125,9 @@ const TorBirdyPrefs = {
   // We do not want to enable a known weak protocol; users should use only use 
TLS
   "security.enable_ssl3": false,
   // Thunderbird 23.0 uses the following preference.
+  // https://bugs.torproject.org/11253
   "security.tls.version.min": 1,
+  "security.tls.version.max": 3,
   // Display a dialog warning the user when entering an insecure site from a 
secure one.
   "security.warn_entering_weak": true,
   // Display a dialog warning the user when submtting a form to an insecure 
site.
@@ -126,6 +142,8 @@ const TorBirdyPrefs = {
   // Disable 'extension blocklist' which might leak the OS information.
   /

[tor-commits] [torbirdy/develop] Configure Riseup accounts automatically

2016-11-24 Thread sukhbir 
commit d9f74a8f71c80eb70ad37a68f8ba743b1779414c
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu May 12 17:51:44 2016 -0400

Configure Riseup accounts automatically
---
 chrome/content/emailwizard.js | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index d38828e..9d88d70 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -90,18 +90,24 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   config.incoming.auth = 3;
   config.outgoing.auth = 3;
 
-  // We will deal with Gmail later because it makes it easier to handle
-  // OAuth2 with the manual configuration.
-  let emailDomain = email.split("@")[1];
-  if (emailDomain === "gmail.com") {
-pub.isGmail = true;
-  }
-
   // Default the outgoing SMTP port.
   config.outgoing.port = 465;
 
   config.outgoing.hostname = "smtp.%EMAILDOMAIN%";
 
+  let emailDomain = email.split("@")[1];
+  // Gmail and Riseup settings.
+  switch (emailDomain) {
+case "gmail.com":
+  // Gmail uses OAuth2, which we deal with later.
+  pub.isGmail = true;
+  break;
+case "riseup.net":
+  config.incoming.hostname = "mail.%EMAILDOMAIN%";
+  config.outgoing.hostname = "mail.%EMAILDOMAIN%";
+  break;
+  }
+
   replaceVariables(config, realname, email, password);
   config.rememberPassword = rememberPassword && !!password;
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Work around Thunderbird forcing login_at_startup for the first account.

2016-11-24 Thread sukhbir 
commit eede7c74389004e8d01d83068e524461adcaa32a
Author: anonym 
Date:   Thu Mar 17 14:08:18 2016 +0100

Work around Thunderbird forcing login_at_startup for the first account.
---
 components/torbirdy.js | 8 
 1 file changed, 8 insertions(+)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 5867f98..2efcfec 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -181,6 +181,14 @@ const TorBirdyPrefs = {
   "mail.inline_attachments": false,
   // Do not IDLE (disable push mail).
   "mail.server.default.use_idle": false,
+  // Thunderbird's autoconfig wizard is designed to enable an initial
+  // mail fetch (by setting login_at_start) for the first account it
+  // creates (which will become the "default" account, see
+  // msgMail3PaneWindow.js for details) which side-steps the settings
+  // we apply in fixupTorbirdySettingsOnNewAccount(). Hence, fool
+  // Thunderbird to think that this initial mail fetch has already
+  // been done so we get the settings we want.
+  "mail.startup.enabledMailCheckOnce": true,
 
   /*
 Browser



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] helo_argument IP should be encapsulated in []'s

2016-11-24 Thread sukhbir 
commit 0f14f38b7fad2983623157eaedc8af294eeb74fc
Author: Ulrike Uhlig 
Date:   Thu Jan 21 13:11:40 2016 +0100

helo_argument IP should be encapsulated in []'s

This is a patch proposed by Chris Knadle chris.kna...@coredump.us
to make torbirdy compliant with RFC 5821 §4.1.3.
Also see Debian bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812115

Also look at which has a related issue:
https://trac.torproject.org/projects/tor/ticket/13006
---
 components/torbirdy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 1dd87fe..22b5853 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -166,7 +166,7 @@ const TorBirdyPrefs = {
   */
 
   // Prevent hostname leaks.
-  "mail.smtpserver.default.hello_argument": "127.0.0.1",
+  "mail.smtpserver.default.hello_argument": "[127.0.0.1]",
   // Compose messages in plain text (by default).
   "mail.html_compose": false,
   "mail.identity.default.compose_html": false,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Do not set the timezone to UTC

2016-11-24 Thread sukhbir 
commit c6de0283fd8fe2a75312985d39e85ba8148f0c97
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Fri May 6 16:03:40 2016 -0400

Do not set the timezone to UTC

TorBirdy was setting the timezone to UTC to prevent leaks in the date and 
the
message-ID header. With #6314 and #6315 fixed and merged upstream, both the
headers are sanitized without explicitly setting the timezone to UTC.
---
 chrome/content/overlay.js|  5 -
 chrome/content/preferences.js| 34 --
 chrome/content/preferences.xul   |  1 -
 chrome/locale/en/torbirdy.dtd|  2 --
 chrome/locale/en/torbirdy.properties |  2 --
 5 files changed, 44 deletions(-)

diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index 3e8f997..f8b1051 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -23,11 +23,6 @@
 prefs.setBoolPref(infoRun, false);
   }
 
-  // Set the time zone to UTC if the preference is true.
-  if (prefs.getBoolPref("extensions.torbirdy.timezone")) {
-env.set('TZ', 'UTC');
-  }
-
   // Check if we are running Whonix.
   var whonix = false;
   if (env.exists("WHONIX")) {
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 94ccb39..a31caf8 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -321,30 +321,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   pub.prefs.setBoolPref(pub.prefBranch + 'startup_folder', false);
 }
 
-// Time zone.
-// default: true
-var timezone = pub.timezone.checked;
-// Only update pub if required.
-if (timezone === pub.prefs.getBoolPref(pub.prefBranch + 'timezone')) {
-var env = Components.classes["@mozilla.org/process/environment;1"]
-  
.getService(Components.interfaces.nsIEnvironment);
-if (timezone) {
-  pub.prefs.setBoolPref(pub.prefBranch + 'timezone', false);
-  env.set('TZ', '');
-} else {
-  pub.prefs.setBoolPref(pub.prefBranch + 'timezone', true);
-  env.set('TZ', 'UTC');
-}
-
-// Ask the user to restart Thunderbird. We can't do pub for the user
-// because the environment variables are not reset without quitting
-// Thunderbird and starting it again.
-var prompts = 
Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-
.getService(Components.interfaces.nsIPromptService);
-prompts.alert(null, pub.strBundle.GetStringFromName("torbirdy.name"),
-
pub.strBundle.GetStringFromName("torbirdy.restart"));
-}
-
 // Fetch all messages for all accounts.
 // default: false
 // Only change the state if it is required.
@@ -435,7 +411,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
 pub.mailAccount = document.getElementById('torbirdy-mail-accounts');
 pub.imapIdle = document.getElementById('torbirdy-idle');
 pub.startupFolder = document.getElementById('torbirdy-startup-folder');
-pub.timezone = document.getElementById('torbirdy-timezone');
 pub.emailWizard = document.getElementById('torbirdy-email-wizard');
 pub.fetchAllMails = document.getElementById('torbirdy-email-automatic');
 // Enigmail.
@@ -524,14 +499,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   pub.startupFolder.checked = true;
 }
 
-// Time zone settings.
-// default: true
-if (pub.prefs.getBoolPref(pub.prefBranch + 'timezone')) {
-  pub.timezone.checked = false;
-} else {
-  pub.timezone.checked = true;
-}
-
 // Fetch all messages for all accounts.
 // default: false
 if (pub.prefs.getBoolPref(pub.prefBranch + 'fetchall')) {
@@ -618,7 +585,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   pub.restoreDefaults = function() {
 // Set the values to their default state.
 pub.anonService.selectedIndex = 0;
-pub.timezone.checked = false;
 pub.enigmailKeyId.checked = false;
 pub.enigmailConfirmEmail.checked = false;
 pub.emailWizard.checked = false;
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 10c0b59..2526f4d 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -99,7 +99,6 @@
 
   
   
-  
   
   
 
diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd
index 3e22539..d670135 100644
--- a/chrome/locale/en/torbirdy.dtd
+++ b/chrome/locale/en/torbirdy.dtd
@@ -37,8 +37,6 @@
 
 
 
-
-
 
 
 
diff --git a/chrome/locale/en/torbirdy.properties 
b/chrome/locale/en/torbirdy.properties
index fcc69a3..2e01136 100644
--- a/chrome/locale/en/torbirdy.properties
+++ b/chrome/local

[tor-commits] [torbirdy/develop] Fix indentation in feedwizard.js

2016-11-24 Thread sukhbir 
commit 405564bc67868489607fab60c7e66beaa5f4ce00
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed May 11 21:49:54 2016 -0400

Fix indentation in feedwizard.js
---
 chrome/content/feedwizard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/feedwizard.js b/chrome/content/feedwizard.js
index 07b01bc..e0698a1 100644
--- a/chrome/content/feedwizard.js
+++ b/chrome/content/feedwizard.js
@@ -15,8 +15,8 @@ if (!org.torbirdy.feedwizard) org.torbirdy.feedwizard = new 
function() {
 ];
 
 for each (var [pref_template, value] in pref_spec) {
-let pref = pref_template.replace("%serverkey%", accountKey);
-Preferences.set(pref, value);
+  let pref = pref_template.replace("%serverkey%", accountKey);
+  Preferences.set(pref, value);
 }
   };
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Set authentication for Gmail to OAuth2 (#17118)

2016-11-24 Thread sukhbir 
commit 1d08d03c80cb01c5495c9e04301ad20b21ae06bb
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon May 9 10:43:35 2016 -0400

Set authentication for Gmail to OAuth2 (#17118)

For Gmail, the authentication type is set to OAuth2 instead of the default
"normal password" which is what most providers use (Google doesn't allow
non-OAuth2 logins). To make this work with the manual configuration wizard 
in
TorBirdy, the authorization step takes place when the user checks the 
account
for the first time, and is not done automatically. We can probably improve
this but it's better to wait for the patches that secure the automatic
configuration wizard to be merged upstream.  See bugzilla 669238.
---
 chrome/content/emailwizard.js | 16 
 components/torbirdy.js|  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 0223e7a..d38828e 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -13,6 +13,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
 
   fixupTorbirdySettingsOnNewAccount = function(account) {
 var idkey = account.defaultIdentity.key;
+var outgoing = account.defaultIdentity.smtpServerKey;
 var serverkey = account.incomingServer.key;
 var protocol = account.incomingServer.type;
 
@@ -21,6 +22,12 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
 ['mail.server.%serverkey%.login_at_startup', false]
 ];
 
+// 10 specifies OAuth2 as the authentication method (used for Gmail).
+if (pub.isGmail) {
+  pref_spec.push(['mail.smtpserver.%outgoing%.authMethod', 10]);
+  pref_spec.push(['mail.server.%serverkey%.authMethod', 10]);
+}
+
 // Make sure that drafts are saved to Local Folders if it is an IMAP 
account.
 if (protocol === "imap") {
 pref_spec.push(['mail.identity.%idkey%.draft_folder',
@@ -35,6 +42,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
 for each (var [pref_template, value] in pref_spec) {
 var pref = pref_template.replace("%idkey%", idkey);
 pref = pref.replace("%serverkey%", serverkey);
+pref = pref.replace("%outgoing%", outgoing);
 Preferences.set(pref, value);
 }
   }
@@ -78,9 +86,17 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
   config.outgoing.socketType = 2;
 
   // Set the authentication to 'Normal' (connection is already encrypted).
+  // This is true for all providers except Gmail, which uses OAuth2.
   config.incoming.auth = 3;
   config.outgoing.auth = 3;
 
+  // We will deal with Gmail later because it makes it easier to handle
+  // OAuth2 with the manual configuration.
+  let emailDomain = email.split("@")[1];
+  if (emailDomain === "gmail.com") {
+pub.isGmail = true;
+  }
+
   // Default the outgoing SMTP port.
   config.outgoing.port = 465;
 
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 276c745..4f83513 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -85,8 +85,8 @@ const TorBirdyPrefs = {
   // We don't want user's of Thunderbird to even come close to such a bypass
   // issue and so we have disabled websockets out of an abundance of caution.
   "network.websocket.enabled": false,
-  // No cookies are allowed.
-  "network.cookie.cookieBehavior": 2,
+  // Cookies are allowed, but not third-party cookies. For Gmail and Twitter.
+  "network.cookie.cookieBehavior": 1,
   // Disable link prefetching.
   "network.prefetch-next": false,
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Fix bug that prevented Thunderbird from starting

2016-11-24 Thread sukhbir 
commit 625f80e1f656f38784c3928cc5e62f1407d1c400
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Mar 9 16:20:56 2015 +0530

Fix bug that prevented Thunderbird from starting
---
 ChangeLog  | 5 +
 components/torbirdy.js | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 020908e..c5b4021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.1.4, 09 March 2015
+  * Fix bug that prevented Thunderbird with TorBirdy 0.1.3 from starting
+  in profiles with more than three IMAP accounts (closes #14099, #13982,
+  #13722, #14007, #14130)
+
 0.1.3, 23 Oct 2014
 
   * The default keyserver (hidden service) has been updated:
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 40adadb..5867f98 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -528,9 +528,9 @@ TorBirdy.prototype = {
 // We need to restore the following preferences after we are 
uninstalled/disabled.
 var restorePrefs = ["draft_folder", "drafts_folder_picker_mode"];
 
-for (var i = 0; i < restorePrefs.length; i++) {
+for (var p = 0; p < restorePrefs.length; p++) {
   var pref = "mail.identity.%id%.".replace("%id%", key);
-  var prefName = pref + restorePrefs[i];
+  var prefName = pref + restorePrefs[p];
   if (this.prefs.prefHasUserValue(prefName)) {
 var typePref = this.prefs.getPrefType(prefName);
 if (typePref === 32) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Merge pull request #26 from arthuredelstein/6314

2016-11-24 Thread sukhbir 
commit bfa822de6071e894dad3d5c59e4fdf2ebacd91e2
Merge: 19cc1c7 7169642
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Dec 10 22:00:00 2015 -0500

Merge pull request #26 from arthuredelstein/6314

Bug #6314: Round Date header down to nearest minute.

 components/torbirdy.js | 20 
 1 file changed, 20 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Let us always disable remote account creation.

2016-11-24 Thread sukhbir 
commit f15169e876225ac28aa3bea10d233c2035a16066
Author: anonym 
Date:   Wed Mar 9 18:47:20 2016 +0100

Let us always disable remote account creation.

When the automatic configuration wizard is enabled we probably want to
use *it*, and not the remote account creation feature. If that is
something TorBirdys want to make enabled as an option, it should not
be baked into this same pref.

However, it probably is something TorBirdy should not encourage (at
least we in Tails decided to disable it), so always hiding it seems
like a good idea.

This fixes Tails bug #10464:

https://labs.riseup.net/code/issues/10464
---
 chrome/content/emailwizard.js | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index a82a188..f149446 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -124,12 +124,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   pub.onLoad = function() {
 if (disableWizard) {
   document.getElementById("torbirdy-protocol-box").collapsed = true;
-  document.getElementById("provisioner_button").disabled = false;
-  document.getElementById("provisioner_button").hidden = false;
-} else {
-  document.getElementById("provisioner_button").disabled = true;
-  document.getElementById("provisioner_button").hidden = true;
 }
+document.getElementById("provisioner_button").disabled = true;
+document.getElementById("provisioner_button").hidden = true;
   };
 
   return pub;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] As suggested by anonym on #13721, add en-US locale to chrome.manifest

2016-11-24 Thread sukhbir 
commit 3d625f36926b958dcaa23ea453d1d2b5a61edee4
Author: Ulrike Uhlig 
Date:   Sun Sep 27 14:11:07 2015 +0200

As suggested by anonym on #13721, add en-US locale to chrome.manifest
---
 chrome.manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chrome.manifest b/chrome.manifest
index 79134aa..78f1183 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -16,6 +16,7 @@ locale castironthunderbirdclub de chrome/locale/de/
 locale castironthunderbirdclub el chrome/locale/el/
 locale castironthunderbirdclub en chrome/locale/en/
 locale castironthunderbirdclub en-GB chrome/locale/en-GB/
+locale castironthunderbirdclub en-US chrome/locale/en/
 locale castironthunderbirdclub es chrome/locale/es/
 locale castironthunderbirdclub eu chrome/locale/eu/
 locale castironthunderbirdclub fr chrome/locale/fr/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Switch to Preferences.jsm.

2016-11-24 Thread sukhbir 
commit c87a2a2b11dc62b4b9a11fe27b2dbc3fd8d163f5
Author: anonym 
Date:   Wed Mar 9 20:07:17 2016 +0100

Switch to Preferences.jsm.

It's cleaner and simpler due to the type inference which we already
use, so let's stick with one approach. Also the explicit default
values make stuff clearer.
---
 chrome/content/emailwizard.js | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index ec73113..3352fb9 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -6,11 +6,8 @@ if (!org.torbirdy) org.torbirdy = {};
 if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
   var pub = {};
 
-  var prefs = Cc["@mozilla.org/preferences-service;1"]
-.getService(Ci.nsIPrefBranch);
-
   var disableWizard = false;
-  if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) {
+  if (Preferences.get("extensions.torbirdy.emailwizard", false)) {
 disableWizard = true;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update website push details

2016-11-24 Thread sukhbir 
commit 1ec029f3f7e6b3892e3b6de9d5dde0af9f2d7b1d
Author: Jacob Appelbaum 
Date:   Thu Oct 23 14:55:13 2014 +

Update website push details
---
 Makefile | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 5b1fe94..96214b1 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,10 @@ sign-release:
sha1sum ../torbirdy-${VERSION}.xpi$
 
 push-release:
-   chmod 664 ../torbirdy-${VERSION}.xpi*$
-   scp ../torbirdy-${VERSION}.xpi* 
vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/$
-   scp ../torbirdy-${VERSION}.xpi 
vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current.xpi$
-   scp ../torbirdy-${VERSION}.xpi.asc 
vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current.xpi.asc$
-   ssh vescum.torproject.org ~mirroradm/bin/trigger-mirrors
+   chmod 664 ../torbirdy-${VERSION}.xpi*
+   scp ../torbirdy-${VERSION}.xpi* 
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy/
+   scp ../torbirdy-${VERSION}.xpi 
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy/torbirdy-current.xpi
+   scp ../torbirdy-${VERSION}.xpi.asc 
staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy/torbirdy-current.xpi.asc
+   ssh staticiforme.torproject.org static-update-component 
dist.torproject.org

 release: sign-release push-release



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Fix name.

2016-11-24 Thread sukhbir 
commit 9ea891ff0819ece07418cde374b97923a0dde2a1
Author: anonym 
Date:   Wed Mar 9 14:00:24 2016 +0100

Fix name.

This method does not necessarily disable the wizard.
---
 chrome/content/emailwizard.js  | 4 ++--
 chrome/content/emailwizard.xul | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index f3f1abd..e17bbd1 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -12,7 +12,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
 disableWizard = true;
   }
 
-  pub.disableAutoWizard = function() {
+  pub.adjustAutoWizard = function() {
 if (!disableWizard) {
   var realname = document.getElementById("realname").value;
   var email = document.getElementById("email").value;
@@ -117,7 +117,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
 if (keycode == 13) {
   if (document.getElementById("next_button").disabled === false) {
 if (!disableWizard) {
-  pub.disableAutoWizard();
+  pub.adjustAutoWizard();
 }
 else {
   gEmailConfigWizard.onNext();
diff --git a/chrome/content/emailwizard.xul b/chrome/content/emailwizard.xul
index 72fad2a..f3a9c60 100644
--- a/chrome/content/emailwizard.xul
+++ b/chrome/content/emailwizard.xul
@@ -9,7 +9,7 @@
   
 
   
+  oncommand="org.torbirdy.emailwizard.adjustAutoWizard();" />
 
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Merge pull request #24 from u451f/patch+13721-default-locale

2016-11-24 Thread sukhbir 
commit 19cc1c71b9ee44554f3ff5ac6006da1380bd3a95
Merge: 4cdded4 3d625f3
Author: Sukhbir Singh <s3si...@uwaterloo.ca>
Date:   Mon Sep 28 03:40:26 2015 -0400

Merge pull request #24 from u451f/patch+13721-default-locale

As suggested by anonym on #13721, add en-US locale to chrome.manifest

 chrome.manifest | 1 +
 1 file changed, 1 insertion(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] switch to new GnuPG key

2016-11-24 Thread sukhbir 
commit afa1e7d019d5765458feba9a2d21bab55beb461a
Author: Jacob Appelbaum 
Date:   Thu Oct 23 14:16:26 2014 +

switch to new GnuPG key
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 078535c..414dff0 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ clean:
rm -f ../torbirdy-$(VERSION).xpi
 
 git-tag:
-   git tag -u 0xD81D840E -s $(VERSION)
+   git tag -u 0xD255D3F5C868227F -s $(VERSION)
 
 git-push:
git push --tags
git push
 
 sign-release:
-   gpg -u 0xD81D840E -abs ../torbirdy-${VERSION}.xpi$
+   gpg -u 0xD255D3F5C868227F -abs ../torbirdy-${VERSION}.xpi$
sha1sum ../torbirdy-${VERSION}.xpi$
 
 push-release:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update the version number

2016-11-24 Thread sukhbir 
commit 4cdded42ca5c6f900c893a8b3d27c50ce6854eac
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Mar 9 16:31:58 2015 +0530

Update the version number
---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index d3108ab..3bad250 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#;>
   
 castironthunderbirdc...@torproject.org
-0.1.3
+0.1.4
 2
 
chrome://castironthunderbirdclub/skin/images/tor.png
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Also apply TorBirdy's account tweaks after autoconfiguraion.

2016-11-24 Thread sukhbir 
commit 56c72de801a816a3f0e231a37a2dff5b7cf3bffb
Author: anonym 
Date:   Wed Mar 9 18:53:34 2016 +0100

Also apply TorBirdy's account tweaks after autoconfiguraion.

This fixes Tails bug #11204:

https://labs.riseup.net/code/issues/11204
---
 chrome/content/emailwizard.js | 70 +++
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index f149446..baf1ef5 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -12,6 +12,36 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
 disableWizard = true;
   }
 
+  fixupTorbirdySettingsOnNewAccount = function(account) {
+var idkey = account.defaultIdentity.key;
+var serverkey = account.incomingServer.key;
+var protocol = account.incomingServer.type;
+
+// Make sure that drafts are saved to Local Folders if it is an IMAP 
account.
+if (protocol === "imap") {
+  var draftFolder = 'mail.identity.%idkey%.draft_folder';
+  var draftFolderPref = draftFolder.replace("%idkey%", idkey);
+  prefs.setCharPref(draftFolderPref, 
"mailbox://nobody@Local%20Folders/Drafts");
+}
+
+// Set check_new_mail to false. We can't do this through the account 
setup, so let's do it here.
+var checkNewMail = 'mail.server.%serverkey%.check_new_mail';
+var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey);
+prefs.setBoolPref(checkNewMailPref, false);
+
+// Do not check for new messages at startup.
+var loginAtStartup = 'mail.server.%serverkey%.login_at_startup';
+var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey);
+prefs.setBoolPref(loginAtStartupPref, false);
+
+// Do not automatically download new messages.
+if (protocol === "pop3") {
+  var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff';
+  var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", 
serverkey);
+  prefs.setBoolPref(downloadOnBiffPref, false);
+}
+  }
+
   pub.adjustAutoWizard = function() {
 if (!disableWizard) {
   var realname = document.getElementById("realname").value;
@@ -66,31 +96,8 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
   replaceVariables(config, realname, email, password);
   config.rememberPassword = rememberPassword && !!password;
 
-  var newAccount = createAccountInBackend(config);
-
-  // Set check_new_mail to false. We can't do this through the account 
setup, so let's do it here.
-  var checkNewMail = 'mail.server.%serverkey%.check_new_mail';
-  var serverkey = newAccount.incomingServer.key;
-  var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey);
-  prefs.setBoolPref(checkNewMailPref, false);
-
-  // Make sure that drafts are saved to Local Folders if it is an IMAP 
account.
-  if (protocol === "imap") {
-var identity = newAccount.defaultIdentity;
-identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts";
-  }
-
-  // Do not check for new messages at startup.
-  var loginAtStartup = 'mail.server.%serverkey%.login_at_startup';
-  var loginAtStartupPref = loginAtStartup.replace("%serverkey%", 
serverkey);
-  prefs.setBoolPref(loginAtStartupPref, false);
-
-  // Do not automatically download new messages.
-  if (protocol === "pop3") {
-var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff';
-var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", 
serverkey);
-prefs.setBoolPref(downloadOnBiffPref, false);
-  }
+  var new_account = createAccountInBackend(config);
+  fixupTorbirdySettingsOnNewAccount(new_account);
 
   // From 
comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : 
onAdvancedSetup().
   var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"]
@@ -102,12 +109,23 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
   } else {
 window.openDialog("chrome://messenger/content/AccountManager.xul",
   "AccountManager", 
"chrome,centerscreen,modal,titlebar",
-  { server: newAccount.incomingServer,
+  { server: new_account.incomingServer,
 selectPage: "am-server.xul" });
   }
   window.close();
 }
 else {
+  // From 
comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : 
finish().
+  // We need somewhere to hook in, so we can access the new
+  // account object created through the autoconfig wizard, and
+  // apply Torbirdy's settings on it.
+  gEmailConfigWizard.finish = function() {
+gEmailWizardLogger.info("creating account in backend");
+var account = createAccountInBackend(this.getConcreteConfig());
+

[tor-commits] [torbirdy/develop] Simplify.

2016-11-24 Thread sukhbir 
commit 9b75deeba42e6e7e94cc5acf6e74651d04f63c10
Author: anonym 
Date:   Wed Mar 9 20:16:59 2016 +0100

Simplify.
---
 chrome/content/emailwizard.js | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 3352fb9..d5adc85 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -6,10 +6,7 @@ if (!org.torbirdy) org.torbirdy = {};
 if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
   var pub = {};
 
-  var disableWizard = false;
-  if (Preferences.get("extensions.torbirdy.emailwizard", false)) {
-disableWizard = true;
-  }
+  var disableWizard = !Preferences.get("extensions.torbirdy.emailwizard", 
false);
 
   fixupTorbirdySettingsOnNewAccount = function(account) {
 var idkey = account.defaultIdentity.key;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update the ChangeLog

2016-11-24 Thread sukhbir 
commit 9a61b8d85eeb0db7110d107d012533882213fb88
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 12:36:49 2014 -0500

Update the ChangeLog
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e81449..ee4ff1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
   * Draft messages on IMAP accounts are now saved locally (closes #10309)
   * Restore preferences to the user's own defaults instead of Thunderbird's
 (closes #10588)
+  * network.proxy.no_proxies_on is no longer set to "localhost, 127.0.0.1"
+(thanks for Carsten N.)
 
 0.1.2, 04 Nov 2013
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update the reply header format (closes #13480)

2016-11-24 Thread sukhbir 
commit 2320b84292f1002fc36b481b1f2f8c7abbdca3da
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Oct 23 12:53:03 2014 +0530

Update the reply header format (closes #13480)
---
 components/torbirdy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index b693bef..71d250e 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -155,6 +155,7 @@ const TorBirdyPrefs = {
   // https://lists.torproject.org/pipermail/tor-talk/2012-May/024395.html
   "mailnews.reply_header_type": 1,
   "mailnews.reply_header_authorwrote": "%s",
+  "mailnews.reply_header_authorwrotesingle": "#1:",
   // Show Sender header in message pane (#10226).
   // http://heise.de/-2044405
   // https://bugzilla.mozilla.org/show_bug.cgi?id=332639



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update emailwizard.js and components/torbirdy.js

2016-11-24 Thread sukhbir 
commit 80e6096833b99eee046704b5245db52b25b14ed9
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 12:20:45 2014 -0500

Update emailwizard.js and components/torbirdy.js

- Ensure for new accounts that login_at_startup and download_on_biff are 
set to
  false.

- Clear the network.proxy.no_proxies_on preference.
---
 chrome/content/emailwizard.js | 12 
 components/torbirdy.js|  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 2cab873..2f2a6a7 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -89,6 +89,18 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
 identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts";
   }
 
+  // Do not check for new messages at startup.
+  var loginAtStartup = 'mail.server.%serverkey%.login_at_startup';
+  var loginAtStartupPref = loginAtStartup.replace("%serverkey%", 
serverkey);
+  prefs.setBoolPref(loginAtStartupPref, false);
+
+  // Do not automatically download new messages.
+  if (protocol === "pop3") {
+var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff';
+var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", 
serverkey);
+prefs.setBoolPref(downloadOnBiffPref, false);
+  }
+
   // From 
comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : 
onAdvancedSetup().
   var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"]
   .getService(Ci.nsIWindowMediator);
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 475dcde..b693bef 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -45,7 +45,6 @@ const TorBirdyPrefs = {
   "network.proxy.socks": "127.0.0.1",
   "network.proxy.socks_port": 9150,
   "network.proxy.socks_version": 5,
-  "network.proxy.no_proxies_on": "localhost, 127.0.0.1",
 
   // Set DNS proxying through SOCKS5.
   "network.proxy.socks_remote_dns": true,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Bug #6314: Round Date header down to nearest minute.

2016-11-24 Thread sukhbir 
commit 7169642643b91f203782d8e6a885d53fbb43f49e
Author: Arthur Edelstein 
Date:   Tue Dec 8 16:59:22 2015 -0800

Bug #6314: Round Date header down to nearest minute.
---
 components/torbirdy.js | 20 
 1 file changed, 20 insertions(+)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 5867f98..1dd87fe 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -312,6 +312,25 @@ var TorBirdyOldPrefs = [
   "network.proxy.http",
 ]
 
+// sanitizeDateHeaders()
+// Run this function to make sure that the Date header in a new message
+// is rounded down to the nearest minute.
+function sanitizeDateHeaders() {
+  // Import the jsmime module that is used to generate mail headers.
+  let { jsmime } = Components.utils.import("resource:///modules/jsmime.jsm");
+  // Inject our own structured encoder to the default header emitter,
+  // to override the default Date encoder with a rounded-down version.
+  jsmime.headeremitter.addStructuredEncoder("Date", function (date) {
+// Copy date
+let roundedDate = new Date(date.getTime());
+// Round down to the nearest minute.
+roundedDate.setSeconds(0);
+// Use the headeremitter's addDate function to format it properly.
+// `this` magically refers to the headeremitter object.
+this.addDate(roundedDate);
+  });
+}
+
 function TorBirdy() {
   this._uninstall = false;
   this.wrappedJSObject = this;
@@ -339,6 +358,7 @@ function TorBirdy() {
 
   this.setAccountPrefs();
   this.setPrefs();
+  sanitizeDateHeaders();
 
   dump("TorBirdy registered!\n");
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Drop special treatment of Tails vs account creation.

2016-11-24 Thread sukhbir 
commit c8da9f2e9006751631a7fbc46be80aaaec31562f
Author: anonym 
Date:   Wed Mar 9 13:53:32 2016 +0100

Drop special treatment of Tails vs account creation.

The extensions.torbirdy.emailwizard pref is enough for Tails'
purposes, so let's clean up a bit.
---
 chrome/content/emailwizard.js | 9 -
 1 file changed, 9 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index 2f2a6a7..f3f1abd 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -7,16 +7,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new 
function() {
   var prefs = Cc["@mozilla.org/preferences-service;1"]
 .getService(Ci.nsIPrefBranch);
 
-  // Check if we are running Tails. If yes, disable the manual account
-  // configuration wizard since Tails handles that on its own. See:
-  // https://tails.boum.org/todo/Return_of_Icedove__63__/#index6h2
-  // This is also disabled if "extensions.torbirdy.emailwizard" is true.
   var disableWizard = false;
-  if (prefs.prefHasUserValue("vendor.name")) {
-if (prefs.getCharPref("vendor.name") === "Tails") {
-  disableWizard = true;
-}
-  }
   if (prefs.getBoolPref("extensions.torbirdy.emailwizard")) {
 disableWizard = true;
   }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Add README.RELEASE instructions

2016-11-24 Thread sukhbir 
commit 714252d242dc967204215063ec300fcf24886890
Author: Jacob Appelbaum 
Date:   Thu Oct 23 14:30:06 2014 +

Add README.RELEASE instructions
---
 Makefile   |  2 +-
 README.RELEASE | 20 
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 414dff0..5b1fe94 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL := /bin/bash
 VERSION := $(shell cat install.rdf|grep ''|cut -d\> -f2|cut -d\< 
-f1)
 
 make-xpi:
-   zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x 
"ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh"
+   zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x 
"ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x 
"README.RELEASE"
 
 clean:
rm -f ../torbirdy-$(VERSION).xpi
diff --git a/README.RELEASE b/README.RELEASE
new file mode 100644
index 000..f398409
--- /dev/null
+++ b/README.RELEASE
@@ -0,0 +1,20 @@
+To perform a release for TorBirdy:
+
+  Perform substantial development effort or patch security issues
+  Review all changes with at least one other person
+  Update ChangeLog to refelect all changes and add a release date
+  Run `make` and test the resulting xpi
+  Confirm that there are no issues with normal use on The Big Three platforms
+  Confirm that the error console does not have any errors related to TorBirdy
+  Tag, sign and push the signatures to git:
+Run `make git-tag` and sign a tag for this release
+Run `make git-push` and push the tag upstream
+  Make detached signature for non-git users:
+Run `make sign-release` and sign the .xpi file
+  Upload packages to the Tor Project webserver:
+Run `push-release` and the packages are uploaded
+  Upload the package to Mozilla's AddOn site manually
+  Write a blog post anouncing the release on the Tor Project blog
+  Write an email anouncing the release to tor-talk
+  Announce the release widely in whatever format is reasonable or desired
+ 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Simplify.

2016-11-24 Thread sukhbir 
commit 63aba79747531845fd44fd96879c669b2921fab3
Author: anonym 
Date:   Wed Mar 9 14:00:41 2016 +0100

Simplify.

The removed logic is already present in pub.adjustAutoWizard().
---
 chrome/content/emailwizard.js | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index e17bbd1..a82a188 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -116,12 +116,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = 
new function() {
 var keycode = event.keyCode;
 if (keycode == 13) {
   if (document.getElementById("next_button").disabled === false) {
-if (!disableWizard) {
-  pub.adjustAutoWizard();
-}
-else {
-  gEmailConfigWizard.onNext();
-}
+pub.adjustAutoWizard();
   }
 }
   };



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Update the ChangeLog

2016-11-24 Thread sukhbir 
commit ed79dadd63337450099c5918e1b0494dbbecfbb1
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 21:13:32 2014 -0500

Update the ChangeLog
---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ee4ff1e..54f2e4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@
   * The default keyserver (hidden service) has been updated:
 - hkp://qdigse2yzvuglcix.onion
   * New translations:
-- Japanese, Malay, Russian
+- Japanese, Malay, Russian, French (Canada), Farsi (Persian), Khmer,
+Korean, Norwegian Bokmål, Ukrainian
   * Show the Sender header in message pane (closes #10226)
   * Draft messages on IMAP accounts are now saved locally (closes #10309)
   * Restore preferences to the user's own defaults instead of Thunderbird's



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Fix a typo

2016-11-24 Thread sukhbir 
commit a178f33f2ec49758c7a3c451548e4732a54a69d4
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 21:24:20 2014 -0500

Fix a typo
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index de1382e..3a1778d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@
   * Restore preferences to the user's own defaults instead of Thunderbird's
 (closes #10588)
   * network.proxy.no_proxies_on is no longer set to "localhost, 127.0.0.1"
-(thanks for Carsten N.)
+(thanks to Carsten N.)
 
 0.1.2, 04 Nov 2013
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] remove dump()

2016-11-24 Thread sukhbir 
commit 44ea30351bcb96a91505c77fd0e7141e35e0
Author: Jacob Appelbaum 
Date:   Thu Oct 23 14:06:29 2014 +

remove dump()
---
 components/torbirdy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 71d250e..40adadb 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -413,7 +413,6 @@ TorBirdy.prototype = {
   },
 
   setPrefs: function() {
-dump("Setting TorBirdy preferences\n");
 // If custom values are set for specific preferences, override the 
defaults with them.
 // For each preference, get the type and then set the property.
 for (var i = 0; i < this.customPrefs.length; i++) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Add new translations and update chrome.manifest

2016-11-24 Thread sukhbir 
commit 7a1d3ad953c330b19c49dd0aac0abc016db4c9a1
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 21:10:55 2014 -0500

Add new translations and update chrome.manifest

- French (Canada)
- Farsi
- Khmer
- Korean
- Norwegian Bokmål
- Ukrainian
---
 chrome.manifest |  6 +++
 chrome/locale/de/torbirdy.dtd   | 88 -
 chrome/locale/de/torbirdy.properties| 10 ++--
 chrome/locale/fa/torbirdy.dtd   | 63 +++
 chrome/locale/fa/torbirdy.properties| 19 +++
 chrome/locale/fr-CA/torbirdy.dtd| 63 +++
 chrome/locale/fr-CA/torbirdy.properties | 19 +++
 chrome/locale/he/torbirdy.dtd   | 30 +--
 chrome/locale/km/torbirdy.dtd   | 63 +++
 chrome/locale/km/torbirdy.properties| 19 +++
 chrome/locale/ko/torbirdy.dtd   | 63 +++
 chrome/locale/ko/torbirdy.properties| 19 +++
 chrome/locale/nb/torbirdy.dtd   | 63 +++
 chrome/locale/nb/torbirdy.properties| 19 +++
 chrome/locale/pt-BR/torbirdy.dtd| 52 +--
 chrome/locale/pt-BR/torbirdy.properties | 12 ++---
 chrome/locale/uk/torbirdy.dtd   | 63 +++
 chrome/locale/uk/torbirdy.properties| 19 +++
 import-translations.sh  |  3 +-
 19 files changed, 596 insertions(+), 97 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 20e4975..317f41f 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -15,12 +15,17 @@ locale castironthunderbirdclub de chrome/locale/de/
 locale castironthunderbirdclub en chrome/locale/en/
 locale castironthunderbirdclub es chrome/locale/es/
 locale castironthunderbirdclub eu chrome/locale/eu/
+locale castironthunderbirdclub fa chrome/locale/fa
 locale castironthunderbirdclub fr chrome/locale/fr/
+locale castironthunderbirdclub fr-CA chrome/locale/fr-CA
 locale castironthunderbirdclub he chrome/locale/he/
 locale castironthunderbirdclub it chrome/locale/it/
 locale castironthunderbirdclub ja chrome/locale/ja/
+locale castironthunderbirdclub km chrome/locale/km
+locale castironthunderbirdclub ko chrome/locale/ko
 locale castironthunderbirdclub lv chrome/locale/lv/
 locale castironthunderbirdclub ms-MY chrome/locale/ms-MY/
+locale castironthunderbirdclub nb chrome/locale/nb/
 locale castironthunderbirdclub nl chrome/locale/nl/
 locale castironthunderbirdclub pa chrome/locale/pa/
 locale castironthunderbirdclub pl chrome/locale/pl/
@@ -28,6 +33,7 @@ locale castironthunderbirdclub pt-BR chrome/locale/pt-BR/
 locale castironthunderbirdclub ru chrome/locale/ru/
 locale castironthunderbirdclub sv chrome/locale/sv/
 locale castironthunderbirdclub tr chrome/locale/tr/
+locale castironthunderbirdclub uk chrome/locale/uk/
 locale castironthunderbirdclub zh-CN chrome/locale/zh-CN/
 
 skin castironthunderbirdclub classic/1.0 chrome/skin/
diff --git a/chrome/locale/de/torbirdy.dtd b/chrome/locale/de/torbirdy.dtd
index 65a7049..ff2ce4a 100644
--- a/chrome/locale/de/torbirdy.dtd
+++ b/chrome/locale/de/torbirdy.dtd
@@ -1,63 +1,63 @@
-
+
 
-
+
 
-
+
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
+
+
+
+
+
 
 
 
-
-
+
+
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
+
+
 
 
-
-
-
+
+
+
 
-
+
diff --git a/chrome/locale/de/torbirdy.properties 
b/chrome/locale/de/torbirdy.properties
index 374f47a..ce42831 100644
--- a/chrome/locale/de/torbirdy.properties
+++ b/chrome/locale/de/torbirdy.properties
@@ -7,13 +7,13 @@ torbirdy.enabled.torification=TorBirdy Aktiv:Transparent 
Torification
 torbirdy.enabled.whonix=TorBirdy Aktiv:Whonix
 torbirdy.disabled=TorBirdy:Deaktiviert!
 
-torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung 
deaktiviert um Ihre Anonymität zu schützen.\n\nDie empfohlenen 
Sicherheitseinstellungen wurden für %S aktiviert.\n\nSie können das Konto 
manuell konfigurieren.
+torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung 
deaktiviert um Ihre Anonymität zu schützen.\n\nDie empfohlenen 
Sicherheitseinstellungen wurden für %S aktiviert.\n\nSie können die anderen 
Kontoeinstellungen manuell konfigurieren.
 
 torbirdy.email.advanced=Es wird NICHT empfohlen, die erweiterten Einstellungen 
von TorBirdy zu ändern.\n\nSie sollten nur fortfahren, wenn Sie genau wissen, 
was Sie tun.
-torbirdy.email.advanced.nextwarning=Zeige diese Warnung weiterhin an
-torbirdy.email.advanced.title=TorBirdy Erweiterte Einstellungen
+torbirdy.email.advanced.nextwarning=Diese Warnung weiterhin anzeigen
+torbirdy.email.advanced.title=TorBirdy erweiterte Einstellungen
 
-torbirdy.restart=Sie müssen Thunderbird neu starten, um die 
Zeitzonen-Einstellungen zu übernehmen.
+torbirdy.restart=Damit die Änderungen an der Zeitzoneneinstellung wirksam 
werden, starten Sie bitte Thunderbi

[tor-commits] [torbirdy/develop] Finalize 31 translations and update relevant files

2016-11-24 Thread sukhbir 
commit 8df3d0b6e90b7eeddbc6db97e5e97b6d38ae7b7a
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Oct 23 16:53:52 2014 +0530

Finalize 31 translations and update relevant files
---
 ChangeLog   | 47 +--
 chrome.manifest | 16 +---
 chrome/locale/ca/torbirdy.dtd   | 63 ++
 chrome/locale/ca/torbirdy.properties| 19 +
 chrome/locale/el/torbirdy.dtd   | 63 ++
 chrome/locale/el/torbirdy.properties| 19 +
 chrome/locale/en-GB/torbirdy.dtd| 63 ++
 chrome/locale/en-GB/torbirdy.properties | 19 +
 chrome/locale/fa/torbirdy.dtd   | 63 --
 chrome/locale/fa/torbirdy.properties| 19 -
 chrome/locale/fr-CA/torbirdy.dtd| 63 --
 chrome/locale/fr-CA/torbirdy.properties | 19 -
 chrome/locale/hu/torbirdy.dtd   | 63 ++
 chrome/locale/hu/torbirdy.properties| 19 +
 chrome/locale/id/torbirdy.dtd   | 63 ++
 chrome/locale/id/torbirdy.properties| 19 +
 chrome/locale/ja/torbirdy.dtd   | 63 --
 chrome/locale/ja/torbirdy.properties| 19 -
 chrome/locale/km/torbirdy.dtd   | 63 --
 chrome/locale/km/torbirdy.properties| 19 -
 chrome/locale/ms-MY/torbirdy.dtd| 63 --
 chrome/locale/ms-MY/torbirdy.properties | 19 -
 chrome/locale/pa/torbirdy.dtd   | 36 -
 chrome/locale/pa/torbirdy.properties|  6 +--
 chrome/locale/pt-BR/torbirdy.dtd| 34 -
 chrome/locale/pt-BR/torbirdy.properties | 10 ++---
 chrome/locale/pt/torbirdy.dtd   | 63 ++
 chrome/locale/pt/torbirdy.properties| 19 +
 chrome/locale/ro/torbirdy.dtd   | 63 ++
 chrome/locale/ro/torbirdy.properties| 19 +
 chrome/locale/sk/torbirdy.dtd   | 63 ++
 chrome/locale/sk/torbirdy.properties| 19 +
 chrome/locale/sl/torbirdy.dtd   | 63 ++
 chrome/locale/sl/torbirdy.properties| 19 +
 chrome/locale/sr/torbirdy.dtd   | 68 +
 chrome/locale/sr/torbirdy.properties| 19 +
 chrome/locale/sv/torbirdy.properties|  6 +--
 chrome/locale/tr/torbirdy.dtd   | 18 -
 chrome/locale/tr/torbirdy.properties|  2 +-
 chrome/locale/zh-CN/torbirdy.dtd| 63 --
 chrome/locale/zh-CN/torbirdy.properties | 19 -
 import-translations.sh  |  4 +-
 install.rdf |  4 +-
 43 files changed, 931 insertions(+), 569 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a1778d..020908e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,48 @@
-0.1.3,
+0.1.3, 23 Oct 2014
 
   * The default keyserver (hidden service) has been updated:
 - hkp://qdigse2yzvuglcix.onion
-  * New translations:
-- Japanese
-- Malay
-- Russian
-- French (Canada)
-- Farsi (Persian)
-- Khmer
-- Korean
-- Norwegian Bokmål
-- Ukrainian
   * Show the Sender header in message pane (closes #10226)
   * Draft messages on IMAP accounts are now saved locally (closes #10309)
   * Restore preferences to the user's own defaults instead of Thunderbird's
 (closes #10588)
   * network.proxy.no_proxies_on is no longer set to "localhost, 127.0.0.1"
 (thanks to Carsten N.)
+  * Disable automatic downloading of new messages for POP3 accounts
+(closes #11188)
+  * Update the reply_header author behaviour (closes #13480)
+  * TorBirdy is now available in 31 languages:
+* Arabic
+* Catalan
+* Czech
+* Danish
+* German
+* Greek
+* English (US)
+* English (Great Britain)
+* Spanish
+* Basque
+* French
+* Hebrew
+* Hungarian
+* Indonesian
+* Italian
+* Korean
+* Latvian
+* Norwegian Bokmål 
+* Norwegian Nynorsk
+* Punjabi
+* Polish
+* Portuguese
+* Portuguese (Brazil)
+* Romanian
+* Russian
+* Slovak
+* Slovenian
+* Serbian
+* Swedish
+* Turkish
+* Ukrainian
 
 0.1.2, 04 Nov 2013
 
diff --git a/chrome.manifest b/chrome.manifest
index 666f166..79134aa 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -9,31 +9,35 @@ contract @torproject.org/torbirdy;1 
{ebd85413-18c8-4265-a708-a8890ec8d1ed}
 category profile-after-change TorBirdy @torproject.org/torbirdy;1
 
 locale castironthunderbirdclub ar chrome/locale/ar/
+locale castironthunderbirdclub ca chrome/locale/ca/
 locale castironthunderbirdclub cs chrome/locale/cs/
 locale castironthunderbi

[tor-commits] [torbirdy/develop] Merge pull request #18 from adrelanos/patch-1

2016-11-24 Thread sukhbir 
commit 9be34f6ac3c12b7b972c6e5768749f6c18725d8c
Merge: 1ec029f b44db6e
Author: Sukhbir Singh <s3si...@uwaterloo.ca>
Date:   Sun Nov 30 21:22:08 2014 +0530

Merge pull request #18 from adrelanos/patch-1

updated Whonix settings

 chrome/content/preferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Better formatting for the ChangeLog languages

2016-11-24 Thread sukhbir 
commit 854cab33ad5d26bf232ff00baf5246371e399c0b
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 21:15:52 2014 -0500

Better formatting for the ChangeLog languages
---
 ChangeLog | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54f2e4d..de1382e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,15 @@
   * The default keyserver (hidden service) has been updated:
 - hkp://qdigse2yzvuglcix.onion
   * New translations:
-- Japanese, Malay, Russian, French (Canada), Farsi (Persian), Khmer,
-Korean, Norwegian Bokmål, Ukrainian
+- Japanese
+- Malay
+- Russian
+- French (Canada)
+- Farsi (Persian)
+- Khmer
+- Korean
+- Norwegian Bokmål
+- Ukrainian
   * Show the Sender header in message pane (closes #10226)
   * Draft messages on IMAP accounts are now saved locally (closes #10309)
   * Restore preferences to the user's own defaults instead of Thunderbird's



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] added version, homepage and source of gpg.conf optimized for privacy

2016-11-24 Thread sukhbir 
commit c00d91959121a265111e335457e25605a9a0a21a
Author: Patrick Schleizer 
Date:   Tue Mar 11 19:19:06 2014 +

added version, homepage and source of gpg.conf optimized for privacy
---
 gpg.conf | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gpg.conf b/gpg.conf
index 32b146c..82a20c7 100644
--- a/gpg.conf
+++ b/gpg.conf
@@ -1,4 +1,8 @@
-## gpg.conf optimized for privacy
+## gpg.conf optimized for privacy 0.2
+## homepage:
+## https://github.com/ioerror/torbirdy/pull/11
+## source:
+## https://github.com/ioerror/torbirdy/blob/master/gpg.conf
 
 ##
 ## BEGIN some suggestions from TorBirdy setting 
extensions.enigmail.agentAdditionalParam



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Merge pull request #15 from adrelanos/gpg.conf_comments

2016-11-24 Thread sukhbir 
commit 89f771363ababcbb718b64136e1bcd545c67171c
Merge: a178f33 c00d919
Author: Sukhbir Singh <sukhbir...@gmail.com>
Date:   Tue Mar 11 20:10:50 2014 -0400

Merge pull request #15 from adrelanos/gpg.conf_comments

added version, homepage and source of gpg.conf optimized for privacy

 gpg.conf | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] Add trailing / to chrome.manifest

2016-11-24 Thread sukhbir 
commit f5a3b5233baa12b4250cdff42b119c33766a4008
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Mar 4 21:19:18 2014 -0500

Add trailing / to chrome.manifest
---
 chrome.manifest | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 317f41f..666f166 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -15,14 +15,14 @@ locale castironthunderbirdclub de chrome/locale/de/
 locale castironthunderbirdclub en chrome/locale/en/
 locale castironthunderbirdclub es chrome/locale/es/
 locale castironthunderbirdclub eu chrome/locale/eu/
-locale castironthunderbirdclub fa chrome/locale/fa
+locale castironthunderbirdclub fa chrome/locale/fa/
 locale castironthunderbirdclub fr chrome/locale/fr/
-locale castironthunderbirdclub fr-CA chrome/locale/fr-CA
+locale castironthunderbirdclub fr-CA chrome/locale/fr-CA/
 locale castironthunderbirdclub he chrome/locale/he/
 locale castironthunderbirdclub it chrome/locale/it/
 locale castironthunderbirdclub ja chrome/locale/ja/
-locale castironthunderbirdclub km chrome/locale/km
-locale castironthunderbirdclub ko chrome/locale/ko
+locale castironthunderbirdclub km chrome/locale/km/
+locale castironthunderbirdclub ko chrome/locale/ko/
 locale castironthunderbirdclub lv chrome/locale/lv/
 locale castironthunderbirdclub ms-MY chrome/locale/ms-MY/
 locale castironthunderbirdclub nb chrome/locale/nb/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/develop] updated Whonix settings

2016-11-24 Thread sukhbir 
commit b44db6e23773fea1d079acb88980b34f1733844f
Author: Patrick Schleizer 
Date:   Sun Nov 30 15:22:11 2014 +0100

updated Whonix settings

Changed socks host IP from 192.168.0.10 to 10.152.152.10 because Whonix 
network configuration has changed.
(Source: 
https://github.com/Whonix/whonix-gw-network-conf/blob/master/etc/network/interfaces.whonix#L57)
---
 chrome/content/preferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 1930f98..1359f63 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -252,7 +252,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new 
function() {
   pub.setProxyWhonix = function() {
 pub.resetAll();
 
-pub.setPreferences("network.proxy.socks", "192.168.0.10");
+pub.setPreferences("network.proxy.socks", "10.152.152.10");
 pub.setPreferences("network.proxy.socks_port", 9102);
 
 
pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.whonix"),
 "green");



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/master] Bump version to 0.2.1

2016-11-24 Thread sukhbir 
commit 5da0998476219764e3d8b06d4c12350ee042e143
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Nov 24 11:20:05 2016 -0500

Bump version to 0.2.1
---
 install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rdf b/install.rdf
index 801c7ad..93736d4 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#;>
   
 castironthunderbirdc...@torproject.org
-0.2.0
+0.2.1
 2
 
chrome://castironthunderbirdclub/skin/images/tor.png
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/master] Bug 20750, 20644: Ensure RSS feeds are displayed as plain text

2016-11-24 Thread sukhbir 
commit 1ee985b6d113780c0cfc0501ece56ca99e98a350
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Nov 24 01:30:13 2016 -0500

Bug 20750, 20644: Ensure RSS feeds are displayed as plain text
---
 components/torbirdy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/torbirdy.js b/components/torbirdy.js
index 6d6bd23..41baf5f 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -320,6 +320,7 @@ var TorBirdyPrefs = {
   // These are similar to the mailnews.* settings.
   "rss.display.disallow_mime_handlers": 3,
   "rss.display.html_as": 1,
+  "rss.show.content-base": 1,
 
   // Override the user agent by setting it to an empty string.
   "general.useragent.override": "",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/master] Update changelog for Bug 20750, 20644

2016-11-24 Thread sukhbir 
commit c2d524c9ca2e5ff541dc904764654bfada054569
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Thu Nov 24 11:13:52 2016 -0500

Update changelog for Bug 20750, 20644
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index a2bbd8c..07774ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.2.1,
  * Bug 20157: Do not set calendar timezone to UTC
+ * Bug 20750, 20644: Ensure RSS feeds are displayed in plain text
  * Revert setting no_proxies_on to an empty string
  * Added support for automatic configuration of systemli.org email accounts
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Release version 0.3.0b1

2016-11-22 Thread sukhbir 
commit deb118c0bf4704a6f44f8d6c37ff0ffeed9c8346
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Nov 22 05:59:08 2016 -0500

Release version 0.3.0b1
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ccd4f87..5de7902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.3.0b1 --
+Tor Messenger 0.3.0b1 -- November 22, 2016
  * All Platforms
* Use the tor-browser-45.5.0esr-6.0-1 branch (e5dafab8) on tor-browser
* Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Remove patch from the Tor Launcher build file

2016-11-16 Thread sukhbir 
commit b2367a7958d7de52553e3b7b7367c5d2adda46a3
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Nov 16 05:43:28 2016 -0500

Remove patch from the Tor Launcher build file
---
 projects/tor-launcher/build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index c6f47fc..1f51756 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -15,6 +15,5 @@ cp ../messenger.png src/chrome/skin/tbb-logo.png
 cp ../default48.png src/chrome/skin/default48.png
 [% END -%]
 patch -p1 < ../logo.patch
-patch -p1 < ../locale-disable.patch
 make package
 mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Remove patch for last commit from config

2016-11-16 Thread sukhbir 
commit 43fe770273b9fa9657d0fd85eb5d4fabbf3320c3
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Nov 16 05:42:03 2016 -0500

Remove patch for last commit from config
---
 projects/tor-launcher/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 0749395..e0a1248 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -12,7 +12,6 @@ input_files:
   - filename: messenger.png
   - filename: default48.png
   - filename: logo.patch
-  - filename: locale-disable.patch
   - filename: controlport.patch
 content: '[% INCLUDE controlport.patch.tmpl -%]'
 refresh_input: 1

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Remove redundant patch for Tor Launcher

2016-11-16 Thread sukhbir 
commit 57d560e3276ee110a0a0208a17264dc9a977a190
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Wed Nov 16 05:40:40 2016 -0500

Remove redundant patch for Tor Launcher
---
 projects/tor-launcher/locale-disable.patch | 12 
 1 file changed, 12 deletions(-)

diff --git a/projects/tor-launcher/locale-disable.patch 
b/projects/tor-launcher/locale-disable.patch
deleted file mode 100644
index c076262..000
--- a/projects/tor-launcher/locale-disable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/defaults/preferences/prefs.js 
b/src/defaults/preferences/prefs.js
-index 2c0a95e..0a0c299 100644
 a/src/defaults/preferences/prefs.js
-+++ b/src/defaults/preferences/prefs.js
-@@ -1,6 +1,6 @@
- // When presenting the setup wizard, first prompt for locale.
- pref("intl.locale.matchOS", true);
--pref("extensions.torlauncher.prompt_for_locale", true);
-+pref("extensions.torlauncher.prompt_for_locale", false);
- 
- pref("extensions.torlauncher.loglevel", 4);  // 1=verbose, 2=debug, 3=info, 
4=note, 5=warn
- pref("extensions.torlauncher.logmethod", 1);  // 0=stdout, 1=errorconsole, 
2=debuglog

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/master] Update README.RELEASE

2016-11-14 Thread sukhbir 
commit 3f4e39cf5a7857fca25795c1b30e0a67a12a69e3
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Sun Nov 13 09:38:36 2016 -0500

Update README.RELEASE
---
 README.RELEASE | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.RELEASE b/README.RELEASE
index f398409..8fb2d86 100644
--- a/README.RELEASE
+++ b/README.RELEASE
@@ -16,5 +16,6 @@ To perform a release for TorBirdy:
   Upload the package to Mozilla's AddOn site manually
   Write a blog post anouncing the release on the Tor Project blog
   Write an email anouncing the release to tor-talk
+  Bump the version number on the wiki and make other relevant changes
   Announce the release widely in whatever format is reasonable or desired
  

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Remove --disable-install-strip from Linux mozconfig

2016-11-07 Thread sukhbir 
commit dfbe9e253b8cf707f14b6a688201e3cd2da29b0e
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Nov 7 09:00:25 2016 -0500

Remove --disable-install-strip from Linux mozconfig
---
 projects/instantbird/mozconfig-linux-i686   | 1 -
 projects/instantbird/mozconfig-linux-x86_64 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/projects/instantbird/mozconfig-linux-i686 
b/projects/instantbird/mozconfig-linux-i686
index 748f937..ef6a5f2 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -11,4 +11,3 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 ac_add_options --host=i686-linux-gnu
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-strip
-ac_add_options --disable-install-strip
diff --git a/projects/instantbird/mozconfig-linux-x86_64 
b/projects/instantbird/mozconfig-linux-x86_64
index 3540800..39a36eb 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -7,4 +7,3 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-strip
-ac_add_options --disable-install-strip

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbirdy/master] Add changelog for version 0.2.1

2016-11-07 Thread sukhbir 
commit c1f8eb6b2216436c12465cd7cfe62d471be881d6
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Nov 7 05:34:06 2016 -0500

Add changelog for version 0.2.1
---
 ChangeLog | 5 +
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ac49c95..a2bbd8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.2.1,
+ * Bug 20157: Do not set calendar timezone to UTC
+ * Revert setting no_proxies_on to an empty string
+ * Added support for automatic configuration of systemli.org email accounts
+
 0.2.0, 27 Jun 2016
 
  * Bug 6314: Prevent local timestamp disclosure via Date header

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Fetch rbm before running a release build

2016-11-06 Thread sukhbir 
commit 5181142380a72f90d2beb4946f554d220d00ec5d
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Sun Nov 6 23:56:38 2016 -0500

Fetch rbm before running a release build
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0e539d1..9335512 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all: tor-messenger
 
 tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 
tor-messenger-windows-i686 tor-messenger-osx-x86_64
 
-tor-messenger-release:
+tor-messenger-release: submodule-update
$(rbm) build tor-messenger-release
 
 tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Bump version in rbm.conf to 0.3.0b1

2016-11-06 Thread sukhbir 
commit a317f6027d01ed1db27b175261f695587b18c0fd
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Sun Nov 6 23:37:37 2016 -0500

Bump version in rbm.conf to 0.3.0b1
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index 7569a12..04d6dc9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -6,7 +6,7 @@ output_dir: "out/[% project %]"
 pkg_type: build
 
 var:
-  tormessenger_version: '0.2.0b2'
+  tormessenger_version: '0.3.0b1'
   build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]'
   build_id_txt: |
 [% c("version") %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Hold conversations by default (see #20208)

2016-09-30 Thread sukhbir 
commit a1020540940e2d2d086e7d944ec9534b3fe54339
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Fri Sep 30 20:06:48 2016 -0400

Hold conversations by default (see #20208)
---
 projects/instantbird/preferences.patch | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index 3c75b02..bcca575 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -116,7 +116,7 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  
  // We have an Error Console menu item by default so let's display chrome 
errors
  pref("javascript.options.showInConsole", true);
-@@ -300,14 +302,73 @@
+@@ -300,14 +302,76 @@
  // 3  at the end of the tabstrip
  pref("browser.tabs.closeButtons", 1);
  
@@ -193,3 +193,6 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
 +
 +// Other Updates
 +pref("app.update.promptWaitTime", 3600);
++
++// Put conversations on hold so that OTR disconnect is not sent. See #20208.
++pref("messenger.conversations.holdByDefault", true);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Fix typo in changelog

2016-09-06 Thread sukhbir 
commit 8b3de3fc0e60928889efe6a316af78d5011ffbf4
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 12:36:15 2016 -0400

Fix typo in changelog
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f612957..e4f5546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Tor Messenger 0.2.0b2 -- September 06, 2016
  * Mac
   * Bug 19269: Fix OS X file permissions
-  * Fix OS X profile when not application not placed in /Applications
+  * Fix OS X profile when application is not placed in /Applications
 
 Tor Messenger 0.2.0b1 -- September 02, 2016
  * All Platforms



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Release version 0.2.0b2

2016-09-06 Thread sukhbir 
commit cd6c78cdc4eb0d797718e5817558d2dfe5a2baab
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 15:31:02 2016 -0400

Release version 0.2.0b2
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index caf7a43..7569a12 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -6,7 +6,7 @@ output_dir: "out/[% project %]"
 pkg_type: build
 
 var:
-  tormessenger_version: '0.2.0b1'
+  tormessenger_version: '0.2.0b2'
   build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]'
   build_id_txt: |
 [% c("version") %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Update changelog for 0.2.0b2

2016-09-06 Thread sukhbir 
commit 80aa83b73a7e39214fbd99ca23d964d50812707e
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 12:35:01 2016 -0400

Update changelog for 0.2.0b2
---
 ChangeLog | 5 +
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1faba19..f612957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tor Messenger 0.2.0b2 -- September 06, 2016
+ * Mac
+  * Bug 19269: Fix OS X file permissions
+  * Fix OS X profile when not application not placed in /Applications
+
 Tor Messenger 0.2.0b1 -- September 02, 2016
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Release version 0.2.0b2

2016-09-06 Thread sukhbir 
commit cd6c78cdc4eb0d797718e5817558d2dfe5a2baab
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 15:31:02 2016 -0400

Release version 0.2.0b2
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index caf7a43..7569a12 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -6,7 +6,7 @@ output_dir: "out/[% project %]"
 pkg_type: build
 
 var:
-  tormessenger_version: '0.2.0b1'
+  tormessenger_version: '0.2.0b2'
   build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]'
   build_id_txt: |
 [% c("version") %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Fix typo in changelog

2016-09-06 Thread sukhbir 
commit 8b3de3fc0e60928889efe6a316af78d5011ffbf4
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 12:36:15 2016 -0400

Fix typo in changelog
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f612957..e4f5546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Tor Messenger 0.2.0b2 -- September 06, 2016
  * Mac
   * Bug 19269: Fix OS X file permissions
-  * Fix OS X profile when not application not placed in /Applications
+  * Fix OS X profile when application is not placed in /Applications
 
 Tor Messenger 0.2.0b1 -- September 02, 2016
  * All Platforms

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Update changelog for 0.2.0b2

2016-09-06 Thread sukhbir 
commit 80aa83b73a7e39214fbd99ca23d964d50812707e
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 12:35:01 2016 -0400

Update changelog for 0.2.0b2
---
 ChangeLog | 5 +
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1faba19..f612957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tor Messenger 0.2.0b2 -- September 06, 2016
+ * Mac
+  * Bug 19269: Fix OS X file permissions
+  * Fix OS X profile when not application not placed in /Applications
+
 Tor Messenger 0.2.0b1 -- September 02, 2016
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Apply patch for #13252 to all platforms

2016-09-06 Thread sukhbir 
commit d280b06001d930c277d1536c982d472ce6d1b244
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 11:54:23 2016 -0400

Apply patch for #13252 to all platforms
---
 projects/instantbird/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index b421403..9b72599 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -135,7 +135,6 @@ input_files:
   - filename: Improve-profile-access-bug-14631-first.mozpatch
   - filename: Improve-profile-access-bug-14631-second.mozpatch
   - filename: Mac-outside-app-data-bug-13252.mozpatch
-enable: '[% c("var/osx") %]'
   - filename: Sign-MAR-files-bug-13379.mozpatch
   - filename: Update-load-local-changes-bug-14392-first.mozpatch
   - filename: Update-load-local-changes-bug-16940-second.mozpatch

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Apply patch for #13252 to all platforms

2016-09-06 Thread sukhbir 
commit d280b06001d930c277d1536c982d472ce6d1b244
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Tue Sep 6 11:54:23 2016 -0400

Apply patch for #13252 to all platforms
---
 projects/instantbird/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index b421403..9b72599 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -135,7 +135,6 @@ input_files:
   - filename: Improve-profile-access-bug-14631-first.mozpatch
   - filename: Improve-profile-access-bug-14631-second.mozpatch
   - filename: Mac-outside-app-data-bug-13252.mozpatch
-enable: '[% c("var/osx") %]'
   - filename: Sign-MAR-files-bug-13379.mozpatch
   - filename: Update-load-local-changes-bug-14392-first.mozpatch
   - filename: Update-load-local-changes-bug-16940-second.mozpatch

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Fix levelsToRemove

2016-09-05 Thread sukhbir 
commit 70c38e1ec0fe72ac4231d2f65f21fd374d5c94a0
Author: Arlo Breault 
Date:   Mon Sep 5 15:34:25 2016 -0700

Fix levelsToRemove

 * It's relative to ExeFile, which should be the same as in TorBrowser.
---
 projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch 
b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
index 4ddb4c0..4501ee7 100644
--- a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
+++ b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
@@ -947,9 +947,9 @@ index 000..2b0b100
 +  NS_ENSURE_ARG_POINTER(aFile);
 +  nsCOMPtr appRootDir = aExeFile;
 +
-+  int levelsToRemove = 0; // Remove firefox (the executable file).
++  int levelsToRemove = 1; // Remove firefox (the executable file).
 +#if defined(XP_MACOSX)
-+  levelsToRemove += 1;   // On Mac OS, we must also remove Contents/MacOS.
++  levelsToRemove += 2;   // On Mac OS, we must also remove Contents/MacOS.
 +#endif
 +  while (appRootDir && (levelsToRemove > 0)) {
 +// When crawling up the hierarchy, components named "." do not count.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Release version 0.2.0b1

2016-09-05 Thread sukhbir 
commit 2515efa405b59f4d8a00259ec34e1ef442d84d16
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Fri Sep 2 12:01:49 2016 -0400

Release version 0.2.0b1
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ace3cbc..1faba19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.2.0b1 -- 
+Tor Messenger 0.2.0b1 -- September 02, 2016
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Fix OS X build permissions (see #19269)

2016-09-05 Thread sukhbir 
commit ec7a83c5e56f4c31faf212e549a7b41382596de8
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Sep 5 20:36:45 2016 -0400

Fix OS X build permissions (see #19269)
---
 projects/tor-messenger/build.osx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 5013d12..2c8bc83 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -55,11 +55,11 @@ cp $rootdir/background.png .background/
 cp $rootdir/DS_Store .DS_Store
 ln -s /Applications/ .
 
-find . -executable -exec chmod 750 {} \;
-find . ! -executable -exec chmod 640 {} \;
+find . -executable -exec chmod 755 {} \;
+find . ! -executable -exec chmod 644 {} \;
 find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > 
../filelist.txt
 find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> 
../filelist.txt
 
-mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0750 -new-dir-mode 0750
+mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0755 -new-dir-mode 0755
 cd ..
 dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Fix OS X build permissions (see #19269)

2016-09-05 Thread sukhbir 
commit ec7a83c5e56f4c31faf212e549a7b41382596de8
Author: Sukhbir Singh <sukh...@torproject.org>
Date:   Mon Sep 5 20:36:45 2016 -0400

Fix OS X build permissions (see #19269)
---
 projects/tor-messenger/build.osx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 5013d12..2c8bc83 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -55,11 +55,11 @@ cp $rootdir/background.png .background/
 cp $rootdir/DS_Store .DS_Store
 ln -s /Applications/ .
 
-find . -executable -exec chmod 750 {} \;
-find . ! -executable -exec chmod 640 {} \;
+find . -executable -exec chmod 755 {} \;
+find . ! -executable -exec chmod 644 {} \;
 find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > 
../filelist.txt
 find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> 
../filelist.txt
 
-mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0750 -new-dir-mode 0750
+mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0755 -new-dir-mode 0755
 cd ..
 dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

<    1   2   3   4   5   6   7   8   9   >