commit f401859518e46d16584ecfa859c773a05362d4be Author: Sukhbir Singh <sukhbir@torproject.org> Date: Wed Sep 2 18:44:58 2015 -0400 Rebase profile folder, credits and in-band patches --- ...e-the-default-Firefox-profile-director.mozpatch | 31 ++------------ projects/instantbird/branding/credits.patch | 9 ---- .../instantbird/xmpp-inband-registration.patch | 45 +++----------------- 3 files changed, 9 insertions(+), 76 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index 45ab38c..a605f4e 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -309,19 +309,7 @@ index a5c71e723907..f93e7f430996 100644 #if defined(MOZ_WIDGET_COCOA) #include <Carbon/Carbon.h> -@@ -279,9 +280,8 @@ nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) - //---------------------------------------------------------------------------------------- - // GetProductDirectory - Gets the directory which contains the application data folder - // --// UNIX : ~/.mozilla/ --// WIN : <Application Data folder on user's machine>\Mozilla --// Mac : :Documents:Mozilla: -+// UNIX and WIN : <App Folder>/TorMessenger/Data/Browser -+// Mac : <App Folder>/../TorMessenger/Data/Browser - //---------------------------------------------------------------------------------------- - NS_METHOD - nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, -@@ -295,48 +295,45 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, +@@ -296,48 +297,45 @@ bool exists; nsCOMPtr<nsIFile> localDir; @@ -403,18 +391,7 @@ index a5c71e723907..f93e7f430996 100644 rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -356,10 +353,6 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, - - //---------------------------------------------------------------------------------------- - // GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir --// --// UNIX : ~/.mozilla/ --// WIN : <Application Data folder on user's machine>\Mozilla\Profiles --// Mac : :Documents:Mozilla:Profiles: - //---------------------------------------------------------------------------------------- - NS_METHOD - nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, -@@ -377,23 +370,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, +@@ -377,23 +375,6 @@ return rv; } @@ -435,6 +412,6 @@ index a5c71e723907..f93e7f430996 100644 - } -#endif - - *aLocalFile = localDir; - NS_ADDREF(*aLocalFile); + localDir.forget(aLocalFile); + return rv; diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch index c256818..a3e7f4a 100644 --- a/projects/instantbird/branding/credits.patch +++ b/projects/instantbird/branding/credits.patch @@ -58,15 +58,6 @@ diff --git a/im/content/aboutDialog.css b/im/content/aboutDialog.css diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul --- a/im/content/aboutDialog.xul +++ b/im/content/aboutDialog.xul -@@ -14,7 +14,7 @@ - %brandDTD; - <!ENTITY % aboutDialogDTD SYSTEM "chrome://instantbird/locale/aboutDialog.dtd" > - %aboutDialogDTD; --<!ENTITY copyrightYear "2014"> -+<!ENTITY copyrightYear "2015"> - #ifdef XP_MACOSX - <!ENTITY % instantbirdDTD SYSTEM "chrome://instantbird/locale/instantbird.dtd"> - %instantbirdDTD; @@ -24,8 +24,7 @@ <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="aboutDialog" diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index 11f26ce..db2a779 100644 --- a/projects/instantbird/xmpp-inband-registration.patch +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -43,31 +43,16 @@ diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.proper diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm --- a/chat/protocols/xmpp/xmpp-session.jsm +++ b/chat/protocols/xmpp/xmpp-session.jsm -@@ -6,16 +6,18 @@ const EXPORTED_SYMBOLS = ["XMPPSession", - - const {classes: Cc, interfaces: Ci, utils: Cu} = Components; - - Cu.import("resource:///modules/imXPCOMUtils.jsm"); - Cu.import("resource:///modules/socket.jsm"); +@@ -11,6 +11,8 @@ Cu.import("resource:///modules/socket.jsm"); Cu.import("resource:///modules/xmpp-xml.jsm"); Cu.import("resource:///modules/xmpp-authmechs.jsm"); +const registerWindow = "chrome://instantbird/content/xmppRegister.xul"; + - XPCOMUtils.defineLazyGetter(this, "_", function() + XPCOMUtils.defineLazyGetter(this, "_", () => l10nHelper("chrome://chat/locale/xmpp.properties") ); - - // Workaround because a lazy getter can't be exported. - XPCOMUtils.defineLazyGetter(this, "_defaultResource", function() - l10nHelper("chrome://branding/locale/brand.properties")("brandShortName") - ); -@@ -63,16 +65,17 @@ XMPPSession.prototype = { - __proto__: Socket, - connectTimeout: 60, - readWriteTimeout: 300, - sendPing: function() { - this.sendStanza(Stanza.iq("get", null, null, +@@ -68,6 +70,7 @@ XMPPSession.prototype = { Stanza.node("ping", Stanza.NS.ping)), this.cancelDisconnectTimer, this); }, @@ -75,17 +60,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses _lastReceiveTime: 0, _lastSendTime: 0, checkPingTimer(aJustSentSomething = false) { - // Don't start a ping timer if we're not fully connected yet. - if (this.onXmppStanza != this.stanzaListeners.accountListening) - return; - let now = Date.now(); - if (aJustSentSomething) -@@ -265,28 +268,103 @@ XMPPSession.prototype = { - _("connection.error.startTLSNotSupported")); - return; - } - - // If we aren't starting TLS, jump to the auth step. +@@ -271,6 +274,69 @@ XMPPSession.prototype = { this.onXmppStanza = this.stanzaListeners.startAuth; this.onXmppStanza(aStanza); }, @@ -155,12 +130,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses startTLS: function(aStanza) { if (aStanza.localName != "proceed") { this._networkError(_("connection.error.failedToStartTLS")); - return; - } - - this.startTLS(); - this._encrypted = true; - this.startStream(); +@@ -283,6 +349,18 @@ XMPPSession.prototype = { this.onXmppStanza = this.stanzaListeners.startAuth; }, startAuth: function(aStanza) { @@ -179,11 +149,6 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses if (aStanza.localName != "features") { this.ERROR("Unexpected stanza " + aStanza.localName + ", expected 'features'"); this._networkError(_("connection.error.incorrectResponse")); - return; - } - - let mechs = aStanza.getElement(["mechanisms"]); - if (!mechs) { diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js