- tor-commits - lists.torproject.org

[tor-messenger-build/master] Rebase xmpp-default-domain.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 2e033a4f84655f9910fcd65ee77cf17f5eaa9e3e Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:54:28 2016 -0400 Rebase xmpp-default-domain.patch --- projects/instantbird/xmpp-default-domain.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/xmpp-default-domain.patch b/projects/instantbird/xmpp-default-domain.patch index d9d6d1e..38bf703 100644 --- a/projects/instantbird/xmpp-default-domain.patch +++ b/projects/instantbird/xmpp-default-domain.patch @@ -4,7 +4,7 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js @@ -31,7 +31,7 @@ usernameSplits: [ - {get label() _("options.domain"), separator: "@", + {get label() { return _("options.domain"); }, separator: "@", - defaultValue: "jabber.org", reverse: true} + defaultValue: "", reverse: true} ],

1 0

[tor-messenger-build/master] Rebase top-protocols.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit df65be620874997866cce05c67d583966ec708fa Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:53:08 2016 -0400 Rebase top-protocols.patch --- projects/instantbird/top-protocols.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch index 59dbbe0..eb7c8f3 100644 --- a/projects/instantbird/top-protocols.patch +++ b/projects/instantbird/top-protocols.patch @@ -1,20 +1,18 @@ diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties -@@ -8,13 +8,14 @@ +@@ -8,11 +8,13 @@ # Exceeding 4 protocols may cause scrolling. A list of the # available protocols can be found at # https://wiki.instantbird.org/Protocol_Identifiers --topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-yahoo +-topProtocol.list=prpl-gtalk,prpl-twitter,prpl-aim,prpl-yahoo,prpl-irc +topProtocol.list=prpl-irc,prpl-jabber,prpl-twitter,prpl-gtalk - + # LOCALIZATION NOTE # These are the descriptions of the top protocols specified above. # A description should be provided for each protocol ID listed above. +topProtocol.prpl-irc.description=Connect to your favourite IRC network +topProtocol.prpl-jabber.description=Chat with friends using XMPP topProtocol.prpl-gtalk.description=Talk to your Gmail contacts --topProtocol.prpl-facebook.description=Communicate with Facebook friends topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger - topProtocol.prpl-yahoo.description=Chat with friends using Yahoo! Messenger

1 0

[tor-messenger-build/master] Rebase themes-remove-links.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit ee9137c99a2974338e6ccf89725293af6c9252ab Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:52:52 2016 -0400 Rebase themes-remove-links.patch --- projects/instantbird/themes-remove-links.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/themes-remove-links.patch b/projects/instantbird/themes-remove-links.patch index 9783e50..8ef25d7 100644 --- a/projects/instantbird/themes-remove-links.patch +++ b/projects/instantbird/themes-remove-links.patch @@ -35,7 +35,7 @@ diff --git a/im/content/preferences/themes.xul b/im/content/preferences/themes.x </hbox> <separator class="thin"/> <label value="&messageStylePreview.label;"/> -@@ -116,8 +114,6 @@ +@@ -115,8 +113,6 @@ </menupopup> </menulist> <separator orient="vertical" class="thin"/>

1 0

[tor-messenger-build/master] Rebase show-traffic-tor.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 0ca906e10fe90cc76b1638f755fe6e6302b70efc Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:52:36 2016 -0400 Rebase show-traffic-tor.patch --- projects/instantbird/show-traffic-tor.patch | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/instantbird/show-traffic-tor.patch b/projects/instantbird/show-traffic-tor.patch index c571b79..ae55305 100644 --- a/projects/instantbird/show-traffic-tor.patch +++ b/projects/instantbird/show-traffic-tor.patch @@ -1,5 +1,4 @@ diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..46447ff 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -39,6 +39,8 @@ @@ -12,7 +11,6 @@ index 5fa5b82..46447ff 100644 <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -index 43d0f19..5492985 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd @@ -6,6 +6,7 @@

1 0

[tor-messenger-build/master] Rebase search-context-menu.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit ba510dce40cfe3b6f5ebcdbb056a2a7eb413dfb8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:51:59 2016 -0400 Rebase search-context-menu.patch --- projects/instantbird/search-context-menu.patch | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/projects/instantbird/search-context-menu.patch b/projects/instantbird/search-context-menu.patch index 20056c2..a27d323 100644 --- a/projects/instantbird/search-context-menu.patch +++ b/projects/instantbird/search-context-menu.patch @@ -1,12 +1,7 @@ diff --git a/im/content/nsContextMenu.js b/im/content/nsContextMenu.js --- a/im/content/nsContextMenu.js +++ b/im/content/nsContextMenu.js -@@ -462,33 +462,17 @@ nsContextMenu.prototype = { - var selectedText = getBrowserSelection(16); - - if (!selectedText) - return false; - +@@ -468,23 +468,7 @@ if (selectedText.length > 15) selectedText = selectedText.substr(0,15) + this.ellipsis; @@ -31,8 +26,3 @@ diff --git a/im/content/nsContextMenu.js b/im/content/nsContextMenu.js }, // Returns true if anything is selected. - isContentSelection: function() { - return !document.commandDispatcher.focusedWindow.getSelection().isCollapsed; - } - }; -

1 0

[tor-messenger-build/master] Rebase irc-default-server.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit fd19280e30be7bdaf6204ccd88d43c103688f35d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:51:16 2016 -0400 Rebase irc-default-server.patch --- projects/instantbird/irc-default-server.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/instantbird/irc-default-server.patch b/projects/instantbird/irc-default-server.patch index 32b06d5..f05a3ff 100644 --- a/projects/instantbird/irc-default-server.patch +++ b/projects/instantbird/irc-default-server.patch @@ -1,10 +1,10 @@ diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js --- a/chat/protocols/irc/irc.js +++ b/chat/protocols/irc/irc.js -@@ -1959,7 +1959,7 @@ +@@ -1931,7 +1931,7 @@ usernameSplits: [ - {get label() _("options.server"), separator: "@", + {get label() { return _("options.server"); }, separator: "@", - defaultValue: "chat.freenode.net", reverse: true} + defaultValue: "", reverse: true} ],

1 0

[tor-messenger-build/master] Rebase disable-links.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 91c2047e8725bddd3ba1d86a9b42f44cc3ff45c5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:49:18 2016 -0400 Rebase disable-links.patch --- projects/instantbird/disable-links.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/projects/instantbird/disable-links.patch b/projects/instantbird/disable-links.patch index d90b0a7..41b23c4 100644 --- a/projects/instantbird/disable-links.patch +++ b/projects/instantbird/disable-links.patch @@ -1,15 +1,7 @@ -# HG changeset patch -# User Sukhbir Singh <sukhbir(a)torproject.org> -# Date 1415125946 -19800 -# Wed Nov 05 00:02:26 2014 +0530 -# Node ID fe384d60035532dd4b81248a345525359ea2f98f -# Parent 947732f86131ec2882340344ba0c29cc9943de48 -Remove formatting for URLs in chat window - diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm -@@ -58,10 +58,6 @@ +@@ -59,10 +59,6 @@ attrs: { }, tags: {

1 0

[tor-messenger-build/master] Rebase CTCP patches
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit aa231247f5bb31edd439db2f22598f46de0baa70 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:48:59 2016 -0400 Rebase CTCP patches --- projects/instantbird/ctcp-ping.patch | 3 +-- projects/instantbird/ctcp-time.patch | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/instantbird/ctcp-ping.patch b/projects/instantbird/ctcp-ping.patch index fb09179..9bc452f 100644 --- a/projects/instantbird/ctcp-ping.patch +++ b/projects/instantbird/ctcp-ping.patch @@ -1,8 +1,7 @@ diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 5722479..4c2d5bf 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm -@@ -167,19 +167,7 @@ var ctcpBase = { +@@ -167,19 +167,7 @@ }, // Used to measure the delay of the IRC network between clients. diff --git a/projects/instantbird/ctcp-time.patch b/projects/instantbird/ctcp-time.patch index 20572e0..4336592 100644 --- a/projects/instantbird/ctcp-time.patch +++ b/projects/instantbird/ctcp-time.patch @@ -1,8 +1,7 @@ diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 5722479..6b82caa 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm -@@ -195,7 +195,7 @@ var ctcpBase = { +@@ -195,7 +195,7 @@ if (aMessage.command == "PRIVMSG") { // TIME // Received a TIME request, send a human readable response.

1 0

[tor-messenger-build/master] Rebase credits.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 4ea285bbc68f9acb944efed1884be587a7620775 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:47:41 2016 -0400 Rebase credits.patch --- projects/instantbird/branding/credits.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch index 7b6f509..1eb297f 100644 --- a/projects/instantbird/branding/credits.patch +++ b/projects/instantbird/branding/credits.patch @@ -167,7 +167,7 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul + <separator/> + <label id="tmLabel" value="&tmText;" /> + <label id="imLabel" value="&imText;" /> -+ </vbox> ++ </vbox> <description id="copyright" flex="1">&copyrightText2;</description> <separator/> - <textbox id="userAgentField" readonly="true" class="plain" @@ -194,8 +194,8 @@ diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en <!ENTITY geckoVersion "Gecko"> <!ENTITY libpurpleVersion "libpurple"> +<!ENTITY ibVersion "Nightly"> -  --<!ENTITY copyrightText2 "©2007-&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> +<!ENTITY tmText "Version &tmVersion;"> +<!ENTITY imText "(Based on Instantbird IM &ibVersion;)"> +  +-<!ENTITY copyrightText2 "©2007-&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> +<!ENTITY copyrightText2 "©&copyrightYear; The Tor Project, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later.">

1 0

[tor-messenger-build/master] Rebase account-picture.patch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 677b8d1fb001dac1c4ac972e6bc7ae2e88d9a6f0 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:45:12 2016 -0400 Rebase account-picture.patch --- projects/instantbird/account-picture.patch | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/projects/instantbird/account-picture.patch b/projects/instantbird/account-picture.patch index 300ecc6..77274d1 100644 --- a/projects/instantbird/account-picture.patch +++ b/projects/instantbird/account-picture.patch @@ -1,12 +1,7 @@ diff --git a/im/content/blist.xul b/im/content/blist.xul --- a/im/content/blist.xul +++ b/im/content/blist.xul -@@ -109,18 +109,17 @@ - </menupopup> - </popupset> - - <toolbox id="mainToolbox"> - <toolbar id="statusArea"> +@@ -114,8 +114,7 @@ <stack id="statusImageStack">  <box id="userIconHolder"> @@ -16,8 +11,3 @@ diff --git a/im/content/blist.xul b/im/content/blist.xul </box> <panel id="changeUserIconPanel" type="arrow" align="center" - onpopupshowing="buddyList.updateUserIconPanelItems();" - onpopuphiding="buddyList.stopWebcamStream();"> - <deck id="userIconPanel"> - <vbox class="userIconPanelMenu"> - <stack id="userIconPanelStack" flex="1">

1 0