March 2016 - tor-commits - lists.torproject.org

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

23 Mar '16

commit 43e68d2b80e1b7ee7c7f78fb499c687a8e8d0b83 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:48:23 2016 -0400 Rebase cert-installer.patch --- projects/instantbird/cert-installer.patch | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch index 58e8020..b514b9f 100644 --- a/projects/instantbird/cert-installer.patch +++ b/projects/instantbird/cert-installer.patch @@ -3,17 +3,16 @@ diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build +++ b/im/app/profile/moz.build @@ -9,6 +9,7 @@ DEFINES['HAVE_SHELL_SERVICE'] = 1 - + FINAL_TARGET_FILES.defaults.profile += [ + 'cert_override.txt', 'localstore.rdf', 'mimeTypes.rdf', ] diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index edf01b1..78db5e4 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in -@@ -155,6 +155,7 @@ +@@ -160,6 +160,7 @@ @RESPATH@/defaults/profile/localstore.rdf @RESPATH@/defaults/profile/prefs.js @RESPATH@/defaults/profile/mimeTypes.rdf @@ -22,10 +21,9 @@ index edf01b1..78db5e4 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 0234b21..5d20e62 100644 --- a/im/installer/Makefile.in +++ b/im/installer/Makefile.in -@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns +@@ -109,7 +109,9 @@ MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " endif @@ -34,5 +32,5 @@ index 0234b21..5d20e62 100644 + defaults/profile/cert_override.txt \ + $(NULL) - ifndef LIBXUL_SDK INSTALL_SDK = 1 +

1 0

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

23 Mar '16

commit fa1cf39170aeae0ab080612dd4cb7898de09a9d7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:55:22 2016 -0400 Rebase xmpp-inband-registration.patch --- .../instantbird/xmpp-inband-registration.patch | 67 ++++------------------ 1 file changed, 11 insertions(+), 56 deletions(-) diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index b669c21..cdf4b31 100644 --- a/projects/instantbird/xmpp-inband-registration.patch +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -29,7 +29,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses +const registerWindow = "chrome://instantbird/content/xmppRegister.xul"; + - XPCOMUtils.defineLazyGetter(this, "_", function() + XPCOMUtils.defineLazyGetter(this, "_", () => l10nHelper("chrome://chat/locale/xmpp.properties") ); @@ -68,6 +70,7 @@ @@ -132,57 +132,32 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js -@@ -106,16 +106,22 @@ var accountWizard = { - }, - - showUsernamePage: function aw_showUsernamePage() { - let proto = this.proto.id; - if ("userNameBoxes" in this && this.userNameProto == proto) { - this.checkUsername(); +@@ -119,6 +119,12 @@ return; } -+ + + if (this.proto.id == "prpl-jabber") { + document.getElementById("registerXMPP").hidden = false; + } else { + document.getElementById("registerXMPP").hidden = true; + } - ++ let bundle = document.getElementById("accountsBundle"); let usernameInfo; let emptyText = this.proto.usernameEmptyText; - if (emptyText) { - usernameInfo = - bundle.getFormattedString("accountUsernameInfoWithDescription", - [emptyText, this.proto.name]); -@@ -412,16 +418,18 @@ var accountWizard = { - createAccount: function aw_createAccount() { - let acc = Services.accounts.createAccount(this.username, this.proto.id); - if (!this.proto.noPassword && this.password) - acc.password = this.password; - if (this.alias) +@@ -424,6 +430,8 @@ acc.alias = this.alias; //FIXME: newMailNotification + acc.setBool("register", document.getElementById("registerXMPP").checked); -+ ++ for (let i = 0; i < this.prefs.length; ++i) { let option = this.prefs[i]; let opt = option.opt; - switch(opt.type) { - case opt.typeBool: - acc.setBool(option.name, option.value); - break; - case opt.typeInt: diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul -@@ -60,16 +60,17 @@ - onpageshow="accountWizard.showUsernamePage();" - onpagehide="accountWizard.hideUsernamePage();" - onpagerewound="return accountWizard.rewindFromUsernamePage();"> - <description id="usernameInfo"/> - <separator/> +@@ -65,6 +65,7 @@ <vbox id="userNameBox"/> <separator/> <description id="duplicateAccount" hidden="true">&accountUsernameDuplicate.label;</description> @@ -190,42 +165,22 @@ diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul </wizardpage> <wizardpage id="accountpassword" pageid="accountpassword" next="accountadvanced" - label="&accountPasswordTitle.label;"> - <description>&accountPasswordInfo.label;</description> - <separator/> - <hbox id="passwordBox" align="baseline"> - <label value="&accountPasswordField.label;" control="password" id="passwordLabel"/> diff --git a/im/content/jar.mn b/im/content/jar.mn --- a/im/content/jar.mn +++ b/im/content/jar.mn -@@ -56,16 +56,18 @@ instantbird.jar: - content/instantbird/proxies.css - content/instantbird/proxy.xml - * content/instantbird/tabbrowser.xml - content/instantbird/tabbrowser.css - content/instantbird/utilities.js +@@ -61,6 +61,8 @@ * content/instantbird/viewlog.xul content/instantbird/viewlog.js content/instantbird/viewlog.css -+* content/instantbird/xmppRegister.xul -+ content/instantbird/xmppRegister.js ++* content/instantbird/xmppRegister.xul ++ content/instantbird/xmppRegister.js #ifdef XP_MACOSX * content/instantbird/hiddenWindow.xul content/instantbird/menus-mac.xul - content/instantbird/macgestures.js - * content/instantbird/jsConsoleOverlay.xul - * content/instantbird/softwareUpdateOverlay.xul - #elifdef XP_WIN - content/instantbird/menus-win.xul diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -@@ -26,8 +26,10 @@ - <!ENTITY accountAliasInfo.label "This will only be displayed in your conversations when you talk, remote buddies won't see it."> - <!ENTITY accountProxySettings.caption "Proxy Settings"> - <!ENTITY accountProxySettings.change.label "Change…"> - <!ENTITY accountProxySettings.change.accessKey "C"> - +@@ -31,3 +31,5 @@ <!ENTITY accountSummaryTitle.label "Summary"> <!ENTITY accountSummaryInfo.label "A summary of the information you entered is displayed below. Please check it before the account is created."> <!ENTITY accountSummary.connectAutomatically.label "Connect this account automatically.">

1 0

[tor-messenger-build/master] Rebase gmploader-sandbox.mozpatch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 396d0b5059eb0aa1b01655f1238384a06ccdee40 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:50:29 2016 -0400 Rebase gmploader-sandbox.mozpatch --- projects/instantbird/gmploader-sandbox.mozpatch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/instantbird/gmploader-sandbox.mozpatch b/projects/instantbird/gmploader-sandbox.mozpatch index a9d167c..5940a6f 100644 --- a/projects/instantbird/gmploader-sandbox.mozpatch +++ b/projects/instantbird/gmploader-sandbox.mozpatch @@ -1,12 +1,12 @@ diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp --- a/dom/media/gmp/GMPLoader.cpp +++ b/dom/media/gmp/GMPLoader.cpp -@@ -227,7 +227,7 @@ +@@ -242,7 +242,7 @@ // Load the GMP. PRLibSpec libSpec; -#ifdef XP_WIN +#if defined(XP_WIN) && defined(MOZ_SANDBOX) - libSpec.value.pathname_u = widePath; - libSpec.type = PR_LibSpec_PathnameU; - #else + int pathLen = MultiByteToWideChar(CP_UTF8, 0, aUTF8LibPath, -1, nullptr, 0); + if (pathLen == 0) { + return false;

1 0

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

23 Mar '16

commit 3a21106fd56415ad4537d0af953d7e29846a1a8a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:50:02 2016 -0400 Rebase fix-mingw-build.patch --- projects/instantbird/fix-mingw-build.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch index 26359f4..3f03c5b 100644 --- a/projects/instantbird/fix-mingw-build.patch +++ b/projects/instantbird/fix-mingw-build.patch @@ -1,8 +1,7 @@ diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index 0376e05c74a5..70c1a6ada34c 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in -@@ -123,6 +123,8 @@ +@@ -104,6 +104,8 @@ #endif #endif # MOZ_ANGLE_RENDERER @@ -11,11 +10,11 @@ index 0376e05c74a5..70c1a6ada34c 100644 #ifndef MOZ_NATIVE_ICU #ifdef MOZ_SHARED_ICU #ifdef XP_WIN -@@ -140,6 +142,7 @@ +@@ -121,6 +123,7 @@ #endif #endif #endif +#endif - ; Modules - @RESPATH@/modules/* + @RESPATH@/components/PACGenerator.js + @RESPATH@/components/PACGenerator.manifest

1 0

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

23 Mar '16

commit d12a6d236db693bf89ed755f8a958f11e5d57052 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:53:24 2016 -0400 Rebase trac-16489.patch --- projects/instantbird/trac-16489.patch | 62 ++++------------------------------- 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/projects/instantbird/trac-16489.patch b/projects/instantbird/trac-16489.patch index 579b286..4d58846 100644 --- a/projects/instantbird/trac-16489.patch +++ b/projects/instantbird/trac-16489.patch @@ -9,12 +9,7 @@ trac 16489 - autologin diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts.js --- a/chat/components/src/imAccounts.js +++ b/chat/components/src/imAccounts.js -@@ -583,17 +583,17 @@ imAccount.prototype = { - if (aException.result != Components.results.NS_ERROR_ABORT) - throw aException; - - gUserCanceledMasterPasswordPrompt = true; - executeSoon(function () { gUserCanceledMasterPasswordPrompt = false; }); +@@ -588,7 +588,7 @@ }, get autoLogin() { @@ -23,20 +18,10 @@ diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts. try { autoLogin = this.prefBranch.getBoolPref(kPrefAccountAutoLogin); } catch (e) { } - return autoLogin; - }, - set autoLogin(val) { - this.prefBranch.setBoolPref(kPrefAccountAutoLogin, val); - SavePrefTimer.initTimer(); diff --git a/im/content/account.xml b/im/content/account.xml --- a/im/content/account.xml +++ b/im/content/account.xml -@@ -36,20 +36,16 @@ - <xul:description class="error" anonid="error"/> - <xul:description class="error" anonid="reconnect"/> - <xul:label class="addException text-link" - onclick="gAccountManager.addException()" - value="&certmgr.addException.label;" +@@ -41,10 +41,6 @@ accesskey="&certmgr.addException.accesskey;"/> <xul:spacer flex="1"/> </xul:vbox> @@ -47,20 +32,10 @@ diff --git a/im/content/account.xml b/im/content/account.xml </xul:hbox> <xul:hbox flex="1" class="account-buttons" anonid="buttons" xbl:inherits="autologin"/> - </xul:vbox> - </content> - <implementation> - <method name="build"> - <parameter name="aAccount"/> diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js -@@ -430,32 +430,23 @@ var accountWizard = { - case opt.typeString: - case opt.typeList: - acc.setString(option.name, option.value); - break; - default: +@@ -442,22 +442,13 @@ throw "unknown type"; } } @@ -84,20 +59,10 @@ diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js if (window.opener) { let am = window.opener.gAccountManager; if (am) - am.selectAccount(acc.id); - } - - return true; - }, diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul -@@ -132,13 +132,11 @@ - <separator/> - <grid id="summarygrid" flex="1"> - <columns> - <column/> - <column flex="1"/> +@@ -137,8 +137,6 @@ </columns> <rows id="summaryRows"/> </grid> @@ -109,12 +74,7 @@ diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul --- a/im/content/preferences/main.xul +++ b/im/content/preferences/main.xul -@@ -15,46 +15,28 @@ - <overlay id="MainPaneOverlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - <prefpane id="paneMain" onpaneload="gMainPane.init();"> - +@@ -20,7 +20,6 @@ <script type="application/javascript" src="chrome://instantbird/content/preferences/main.js"/> <preferences id="mainPreferences"> @@ -122,12 +82,7 @@ diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul <preference id="messenger.options.playSounds.blist" name="messenger.options.playSounds.blist" type="bool"/> <preference id="messenger.options.playSounds.message" name="messenger.options.playSounds.message" type="bool"/> <preference id="messenger.options.getAttentionOnNewMessages" name="messenger.options.getAttentionOnNewMessages" type="bool"/> - #ifdef XP_MACOSX - <preference id="messenger.options.showUnreadCountInDock" name="messenger.options.showUnreadCountInDock" type="bool"/> - #else - <preference id="extensions.mintrayr.alwaysShowTrayIcon" name="extensions.mintrayr.alwaysShowTrayIcon" type="bool"/> - <preference id="extensions.mintrayr.minimizeon" name="extensions.mintrayr.minimizeon" type="int"/> - #endif +@@ -33,23 +32,6 @@ <preference id="messenger.options.notifyOfNewMessages" name="messenger.options.notifyOfNewMessages" type="bool"/> </preferences> @@ -151,8 +106,3 @@ diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul <groupbox id="accountsMgrGroup" orient="horizontal" align="center"> <caption label="&accountsMgr.label;"/> - <description control="manageAccounts" - #ifdef XP_WIN - flex="1">&manageAccountsDescWin.label;</description> - #else - flex="1">&manageAccountsDescUnix2.label;</description>

1 0

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

23 Mar '16

commit 769f1b2d897db0ac9ed8a9ed0f9e40c9eedf51a2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:53:54 2016 -0400 Rebase trac-17896.patch --- projects/instantbird/trac-17896.patch | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/projects/instantbird/trac-17896.patch b/projects/instantbird/trac-17896.patch index 41781e1..ebef6e4 100644 --- a/projects/instantbird/trac-17896.patch +++ b/projects/instantbird/trac-17896.patch @@ -11,12 +11,7 @@ Adding an edit menu also enables the emoji panel and dictation. diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul --- a/im/content/instantbird.xul +++ b/im/content/instantbird.xul -@@ -43,17 +43,38 @@ - #else - <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> - #endif - <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/> - <script type="application/javascript" src="chrome://instantbird/content/convZoom.js"/> +@@ -48,7 +48,28 @@ <script type="application/javascript" src="chrome://instantbird/content/nsContextMenu.js"/> #ifdef XP_MACOSX @@ -46,20 +41,10 @@ diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul #endif <commandset id="conversationsCommands"> - <command id="cmd_newtab" oncommand="Conversations.showNewTab()"/> - <command id="cmd_close" oncommand="getTabBrowser().removeCurrentTab()"/> - <command id="cmd_putOnHold" - oncommand="var tabbrowser = getTabBrowser(); - if (!tabbrowser.selectedConversation) return; diff --git a/im/content/menus.xul b/im/content/menus.xul --- a/im/content/menus.xul +++ b/im/content/menus.xul -@@ -38,17 +38,17 @@ - <key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/> - <key id="joinChatkey" key="&joinChat.commandkey;" command="cmd_joinchat" modifiers="accel"/> - <key id="addBuddykey" key="&addContact.commandkey;" command="cmd_addbuddy" modifiers="accel"/> - <key id="newtabkey" key="&newtab.commandkey;" command="cmd_newtab" modifiers="accel"/> - <key id="addonskey" key="&addonManager.commandkey;" command="cmd_addons" modifiers="accel"/> +@@ -43,7 +43,7 @@ </keyset> <menubar id="blistMenubar"> @@ -68,16 +53,10 @@ diff --git a/im/content/menus.xul b/im/content/menus.xul <menupopup id="fileMenuPopup" onpopupshowing="menus.updateFileMenuitems();"> <menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/> <menuitem id="newTabMenuItem" label="&newtab;" command="cmd_newtab" key="newtabkey" accesskey="&newtab.accesskey;"/> - <menuitem id="joinChatMenuItem" label="&joinChat;" command="cmd_joinchat" key="joinChatkey" accesskey="&joinChat.accesskey;"/> - <menuseparator/> - <menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);" accesskey="&setStatusTo.accesskey;" > - <menupopup id="setStatusMenupopup">  - <menuitem id="statusAvailable" status="available" label="&available;" accesskey="&available.accesskey;" class="menuitem-iconic"/> diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc --- a/im/content/menus.xul.inc +++ b/im/content/menus.xul.inc -@@ -1,8 +1,10 @@ - # This Source Code Form is subject to the terms of the Mozilla Public +@@ -2,6 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -86,4 +65,3 @@ diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc <commandset id="maincommandset"/> <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> - <popupset id="mainPopupSet"/>

1 0

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

23 Mar '16

commit 414686e58eac89c9c903ce722cbc3cce54f47696 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:54:43 2016 -0400 Rebase xmpp-gtalk-resource.patch --- projects/instantbird/xmpp-gtalk-resource.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/instantbird/xmpp-gtalk-resource.patch b/projects/instantbird/xmpp-gtalk-resource.patch index e9432e4..a09d538 100644 --- a/projects/instantbird/xmpp-gtalk-resource.patch +++ b/projects/instantbird/xmpp-gtalk-resource.patch @@ -1,14 +1,14 @@ diff --git a/chat/protocols/gtalk/gtalk.js b/chat/protocols/gtalk/gtalk.js --- a/chat/protocols/gtalk/gtalk.js +++ b/chat/protocols/gtalk/gtalk.js -@@ -95,7 +95,7 @@ - getAccount: function(aImAccount) new GTalkAccount(this, aImAccount), +@@ -96,7 +96,7 @@ + getAccount: function(aImAccount) { return new GTalkAccount(this, aImAccount); }, options: { - resource: {get label() _("options.resource"), -- get default() XMPPDefaultResource} + resource: {get label() { return _("options.resource"); }, +- get default() { return XMPPDefaultResource; }} + default: "Instantbird"}, }, - get chatHasTopic() true, + get chatHasTopic() { return true; }, classID: Components.ID("{38a224c1-6748-49a9-8ab2-efc362b1000d}") diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js --- a/chat/protocols/xmpp/xmpp.js @@ -16,9 +16,9 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js @@ -36,7 +36,7 @@ options: { - resource: {get label() _("options.resource"), -- get default() XMPPDefaultResource}, + resource: {get label() { return _("options.resource"); }, +- get default() { return XMPPDefaultResource; }}, + default: "Instantbird"}, - priority: {get label() _("options.priority"), default: 0}, + priority: {get label() { return _("options.priority"); }, default: 0}, connection_security: { - get label() _("options.connectionSecurity"), + get label() { return _("options.connectionSecurity"); },

1 0

[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