September 2015 - tor-commits - lists.torproject.org

[tor/master] Remove comment about a workaround for libevent versions we no longer work around. Fixes 16647
by nickm＠torproject.org 30 Sep '15

30 Sep '15

commit 0d43a54d1c9c1be24c33eed79029d1bd44a6a28a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 30 09:29:16 2015 -0400 Remove comment about a workaround for libevent versions we no longer work around. Fixes 16647 --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index 53ed865..3bf2f47 100644 --- a/configure.ac +++ b/configure.ac @@ -374,10 +374,6 @@ AC_SEARCH_LIBS(pthread_detach, [pthread]) AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") -dnl ------------------------------------------------------------------- -dnl Check for functions before libevent, since libevent-1.2 apparently -dnl exports strlcpy without defining it in a header. - AC_CHECK_FUNCS( _NSGetEnviron \ accept4 \

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 30 Sep '15

30 Sep '15

commit bcec5b159196c3ed98226457644842b8ab6b5a18 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 30 13:16:20 2015 +0000 Update translations for tor-messenger-conversationsproperties_completed --- bg/conversations.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bg/conversations.properties b/bg/conversations.properties index d5d1dd4..e138419 100644 --- a/bg/conversations.properties +++ b/bg/conversations.properties @@ -56,6 +56,17 @@ topicChanged=%1$S промени темата на: %2$S. # %1$S is the user who cleared the topic. topicCleared=%1$S изтри темата. +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S сега е известен като %2$S. +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=Познати сте като %S. + # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut messenger.conversations.selections.ellipsis=[…]

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 30 Sep '15

30 Sep '15

commit c41a7de50db748db52d89c77e45f4247f1f92fc5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 30 13:16:16 2015 +0000 Update translations for tor-messenger-conversationsproperties --- bg/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/conversations.properties b/bg/conversations.properties index 700c58c..e138419 100644 --- a/bg/conversations.properties +++ b/bg/conversations.properties @@ -61,11 +61,11 @@ topicCleared=%1$S изтри темата. # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S сега е известен като %2$S. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Познати сте като %S. # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut

1 0

[tor-messenger-build/master] Fix another typo in XMPP in-band registration
by sukhbir＠torproject.org 30 Sep '15

30 Sep '15

commit 4cc6e89c13779c92d11869c0a7ab4a588586e8ea Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Sep 30 09:06:20 2015 -0400 Fix another typo in XMPP in-band registration --- projects/instantbird/xmpp-inband-registration.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index 8ca5639..b669c21 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, "_", function() l10nHelper("chrome://chat/locale/xmpp.properties") ); @@ -68,6 +70,7 @@

1 0

[tor-messenger-build/master] Fix typo in XMPP in-band patch
by sukhbir＠torproject.org 30 Sep '15

30 Sep '15

commit 709c219c525afe9c5cee2b5e9012ebb4be389e77 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Sep 30 08:54:04 2015 -0400 Fix typo in XMPP in-band patch --- projects/instantbird/xmpp-inband-registration.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index 91b5e84..8ca5639 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, "_", () => + XPCOMUtils.defineLazyGetter(this, "_", function() => l10nHelper("chrome://chat/locale/xmpp.properties") ); @@ -68,6 +70,7 @@

1 0

[tor-messenger-build/master] Fix double definition of MFVideoFormat_VP80 with mingw-w64
by boklm＠torproject.org 30 Sep '15

30 Sep '15

commit 80c076b1c188757ebdec136f8c23540a2912f3a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 30 14:37:18 2015 +0200 Fix double definition of MFVideoFormat_VP80 with mingw-w64 --- ...efinition-of-MFVideoFormat_VP80-with-m.mozpatch | 29 ++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 31 insertions(+) diff --git a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch new file mode 100644 index 0000000..f2f6f47 --- /dev/null +++ b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch @@ -0,0 +1,29 @@ +From dd5b8134fd85507d68ed79f9efbb3afc87ee9d7e Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Wed, 30 Sep 2015 14:35:36 +0200 +Subject: [PATCH] Avoid double definition of MFVideoFormat_VP80 with mingw-w64 + +--- + dom/media/platforms/wmf/WMFVideoMFTManager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +index ba87a34bc6db..33ab0a4ad5a8 100644 +--- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp ++++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +@@ -31,6 +31,7 @@ using mozilla::layers::LayerManager; + using mozilla::layers::LayersBackend; + + #if MOZ_WINSDK_MAXVER < 0x0A000000 ++#if 0 + // Windows 10+ SDK has VP80 and VP90 defines + const GUID MFVideoFormat_VP80 = + { +@@ -48,6 +49,7 @@ const GUID MFVideoFormat_VP90 = + {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} + }; + #endif ++#endif + + const CLSID CLSID_WebmMfVp8Dec = + { diff --git a/projects/instantbird/config b/projects/instantbird/config index d5fec05..6da5a48 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -122,6 +122,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch enable: '[% c("var/windows") %]' + - filename: 0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch + enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[tor-messenger-build/master] Add another patch to fix windows cross compilation
by arlo＠torproject.org 30 Sep '15

30 Sep '15

commit 0668923492d7b81292138b7c10b2f7093236a592 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Sep 30 13:36:02 2015 +0200 Add another patch to fix windows cross compilation * https://bugzilla.mozilla.org/show_bug.cgi?id=1197282 --- ...1197282-include-atomic-in-videodecoder.mozpatch | 53 ++++++++++++++++++++ projects/instantbird/config | 2 + 2 files changed, 55 insertions(+) diff --git a/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch b/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch new file mode 100644 index 0000000..c6e3b3c --- /dev/null +++ b/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch @@ -0,0 +1,53 @@ + +# HG changeset patch +# User Jacek Caban <jacek(a)codeweavers.com> +# Date 1440499220 -7200 +# Node ID 0d3b1fd5f2d10562fec06f21f7297c0722159a6b +# Parent c4b66462595789190a33a11b211e3977ecc7c5f6 +Bug 1197282 - Include <atomic> in VideoDecoder.h. r=cpearce + +diff --git a/media/gmp-clearkey/0.1/AnnexB.cpp b/media/gmp-clearkey/0.1/AnnexB.cpp +--- a/media/gmp-clearkey/0.1/AnnexB.cpp ++++ b/media/gmp-clearkey/0.1/AnnexB.cpp +@@ -12,16 +12,18 @@ + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #include "AnnexB.h" + #include "Endian.h" + ++#include <cstring> ++ + using mozilla::BigEndian; + + static const uint8_t kAnnexBDelimiter[] = { 0, 0, 0, 1 }; + + /* static */ void + AnnexB::ConvertFrameInPlace(std::vector<uint8_t>& aBuffer) + { + for (size_t i = 0; i < aBuffer.size() - 4 - sizeof(kAnnexBDelimiter) + 1; ) { +diff --git a/media/gmp-clearkey/0.1/VideoDecoder.h b/media/gmp-clearkey/0.1/VideoDecoder.h +--- a/media/gmp-clearkey/0.1/VideoDecoder.h ++++ b/media/gmp-clearkey/0.1/VideoDecoder.h +@@ -12,16 +12,18 @@ + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #ifndef __VideoDecoder_h__ + #define __VideoDecoder_h__ + ++#include <atomic> ++ + #include "gmp-task-utils.h" + #include "gmp-video-decode.h" + #include "gmp-video-host.h" + #include "WMFH264Decoder.h" + + #include "mfobjects.h" + + class VideoDecoder : public GMPVideoDecoder + diff --git a/projects/instantbird/config b/projects/instantbird/config index cf4274f..d5fec05 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -120,6 +120,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch enable: '[% c("var/windows") %]' + - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch + enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[tor-messenger-build/master] Rebase firefox profile directory patch on Firefox 42 beta
by boklm＠torproject.org 30 Sep '15

30 Sep '15

commit 4966dbed4c50382b92896958fb69ce5a90c4bbc6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 30 13:09:24 2015 +0200 Rebase firefox profile directory patch on Firefox 42 beta --- ...e-the-default-Firefox-profile-director.mozpatch | 103 +++++++++++++------- 1 file changed, 70 insertions(+), 33 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 a605f4e..a3ca392 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 @@ -1,5 +1,20 @@ +From 64c1b7b7756ba9f68bb84a33d77ae8bd31a209c5 Mon Sep 17 00:00:00 2001 +From: Kathy Brade <brade(a)pearlcrescent.com> +Date: Fri, 18 Oct 2013 15:20:06 -0400 +Subject: [PATCH] Bug #9173: Change the default Firefox profile directory to be + TBB-relative. + +This should eliminate our need to rely on a wrapper script that sets $HOME and +launches Firefox with -profile. +--- + toolkit/xre/nsXREDirProvider.cpp | 161 +++++++-------------------------- + toolkit/xre/nsXREDirProvider.h | 10 +- + xpcom/io/moz.build | 4 + + xpcom/io/nsAppFileLocationProvider.cpp | 96 ++++++++------------ + 4 files changed, 79 insertions(+), 192 deletions(-) + diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index c496a14ce84a..689cb0f8ecb1 100644 +index 7d09374ba773..417ebee773ba 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -32,6 +32,7 @@ @@ -10,7 +25,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -200,9 +201,6 @@ +@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -20,7 +35,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -225,9 +223,6 @@ +@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -30,7 +45,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1222,90 +1217,45 @@ +@@ -1222,90 +1217,45 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -38,11 +53,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 + NS_ENSURE_ARG_POINTER(aFile); nsCOMPtr<nsIFile> localDir; -+ nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ int levelsToRemove = 0; - #if defined(XP_MACOSX) +-#if defined(XP_MACOSX) - FSRef fsRef; - OSType folderType; - if (aLocal) { @@ -52,14 +63,21 @@ index c496a14ce84a..689cb0f8ecb1 100644 - folderType = kDomainLibraryFolderType; -#else - folderType = kApplicationSupportFolderType; -+ levelsToRemove += 1; - #endif +-#endif - } - OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef); - NS_ENSURE_FALSE(err, NS_ERROR_FAILURE); - - rv = NS_NewNativeLocalFile(EmptyCString(), true, getter_AddRefs(localDir)); -- NS_ENSURE_SUCCESS(rv, rv); ++ nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir)); + NS_ENSURE_SUCCESS(rv, rv); + +- nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir); +- NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); ++ int levelsToRemove = 0; ++#if defined(XP_MACOSX) ++ levelsToRemove += 1; ++#endif + while (localDir && (levelsToRemove > 0)) { + // When crawling up the hierarchy, components named "." do not count. + nsAutoCString removedName; @@ -67,20 +85,14 @@ index c496a14ce84a..689cb0f8ecb1 100644 + NS_ENSURE_SUCCESS(rv, rv); + bool didRemove = !removedName.Equals("."); -- nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir); -- NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); +- rv = dirFileMac->InitWithFSRef(&fsRef); +- NS_ENSURE_SUCCESS(rv, rv); + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; -- rv = dirFileMac->InitWithFSRef(&fsRef); -- NS_ENSURE_SUCCESS(rv, rv); -+ if (didRemove) -+ --levelsToRemove; -+ } - - localDir = do_QueryInterface(dirFileMac, &rv); -#elif defined(XP_IOS) - nsAutoCString userDir; @@ -103,9 +115,11 @@ index c496a14ce84a..689cb0f8ecb1 100644 - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } -- } ++ if (didRemove) ++ --levelsToRemove; + } - NS_ENSURE_SUCCESS(rv, rv); -- + - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -148,7 +162,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 NS_IF_ADDREF(*aFile = localDir); return rv; -@@ -1518,48 +1468,25 @@ +@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, } nsAutoCString profile; @@ -200,7 +214,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 #elif defined(ANDROID) // The directory used for storing profiles -@@ -1571,12 +1498,6 @@ +@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) @@ -213,7 +227,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); -@@ -1585,31 +1506,17 @@ +@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, // On the off chance that someone wanted their folder to be hidden don't // let it become ".." @@ -250,7 +264,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 #else #error "Don't know how to get profile path on your platform" diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h -index 3944c90a401b..c984933f047e 100644 +index eb27ed27fc26..1985f668a5b2 100644 --- a/toolkit/xre/nsXREDirProvider.h +++ b/toolkit/xre/nsXREDirProvider.h @@ -56,16 +56,16 @@ public: @@ -285,10 +299,10 @@ index 3944c90a401b..c984933f047e 100644 static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); #endif diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build -index b4dfc03b4683..6e1936fe8666 100644 +index 69208996e4d7..280f23f6fd82 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build -@@ -134,4 +134,8 @@ FINAL_LIBRARY = 'xul' +@@ -132,4 +132,8 @@ FINAL_LIBRARY = 'xul' if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']: DEFINES['HAVE_USR_LIB64_DIR'] = True @@ -298,7 +312,7 @@ index b4dfc03b4683..6e1936fe8666 100644 + GENERATED_INCLUDES += ['..'] diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp -index a5c71e723907..f93e7f430996 100644 +index 540f53fb471b..59785d5f064a 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -14,6 +14,7 @@ @@ -309,7 +323,19 @@ index a5c71e723907..f93e7f430996 100644 #if defined(MOZ_WIDGET_COCOA) #include <Carbon/Carbon.h> -@@ -296,48 +297,45 @@ +@@ -280,9 +281,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, +@@ -296,48 +296,45 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; @@ -391,7 +417,18 @@ index a5c71e723907..f93e7f430996 100644 rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { -@@ -377,23 +375,6 @@ +@@ -357,10 +354,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, +@@ -378,23 +371,6 @@ nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile** aLocalFile, return rv; } @@ -412,6 +449,6 @@ index a5c71e723907..f93e7f430996 100644 - } -#endif - - localDir.forget(aLocalFile); + *aLocalFile = localDir; + NS_ADDREF(*aLocalFile); - return rv;

1 0

[tor-messenger-build/master] Merge branch 'master' of git-rw.torproject.org:tor-messenger-build
by sukhbir＠torproject.org 30 Sep '15

30 Sep '15

commit 384ae961289320846425f5256b6c2b8152acdcc5 Merge: d8ce0c6 26dc4eb Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Sep 30 06:51:45 2015 -0400 Merge branch 'master' of git-rw.torproject.org:tor-messenger-build ...xed-WinIMEHandler.cpp-cross-compilatio.mozpatch | 27 ++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 29 insertions(+)

1 0

[tor-messenger-build/master] Update XMPP in-band registration patch
by sukhbir＠torproject.org 30 Sep '15

30 Sep '15

commit d8ce0c6a9d4881faa92fe8b2a2a4f0044eaf155d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Sep 30 06:51:29 2015 -0400 Update XMPP in-band registration patch --- .../instantbird/xmpp-inband-registration.patch | 32 ++++---------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index db2a779..91b5e84 100644 --- a/projects/instantbird/xmpp-inband-registration.patch +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -1,12 +1,7 @@ diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties --- a/chat/locales/en-US/xmpp.properties +++ b/chat/locales/en-US/xmpp.properties -@@ -8,16 +8,19 @@ - # (These will be displayed in account.connection.progress from - # accounts.properties, which adds … at the end, so do not include - # periods at the end of these messages.) - connection.initializingStream=Initializing stream - connection.initializingEncryption=Initializing encryption +@@ -13,6 +13,9 @@ connection.authenticating=Authenticating connection.gettingResource=Getting resource connection.downloadingRoster=Downloading contact list @@ -16,17 +11,7 @@ diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.proper # LOCALIZATION NOTE (connection.error.*) # These will show in the account manager if an error occurs during the - # connection attempt. - connection.error.invalidUsername=Invalid username (your username should contain an '@' character) - connection.error.failedToCreateASocket=Failed to create a socket (Are you offline?) - connection.error.serverClosedConnection=The server closed the connection - connection.error.resetByPeer=Connection reset by peer -@@ -28,16 +31,18 @@ connection.error.startTLSRequired=The se - connection.error.startTLSNotSupported=The server doesn't support encryption but your configuration requires it - connection.error.failedToStartTLS=Failed to start encryption - connection.error.noAuthMec=No authentication mechanism offered by the server - connection.error.noCompatibleAuthMec=None of the authentication mechanisms offered by the server are supported - connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext +@@ -33,6 +36,8 @@ connection.error.authenticationFailure=Authentication failure connection.error.notAuthorized=Not authorized (Did you enter the wrong password?) connection.error.failedToGetAResource=Failed to get a resource @@ -35,15 +20,10 @@ diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.proper # LOCALIZATION NOTE (conversation.error.notDelivered): - # This is displayed in a conversation as an error message when a message - # the user has sent wasn't delivered. - # %S is replaced by the text of the message that wasn't delivered. - conversation.error.notDelivered=This message could not be delivered: %S - # This is displayed in a conversation as an error message when joining a MUC 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 -@@ -11,6 +11,8 @@ Cu.import("resource:///modules/socket.jsm"); +@@ -11,6 +11,8 @@ Cu.import("resource:///modules/xmpp-xml.jsm"); Cu.import("resource:///modules/xmpp-authmechs.jsm"); @@ -52,7 +32,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses XPCOMUtils.defineLazyGetter(this, "_", () => l10nHelper("chrome://chat/locale/xmpp.properties") ); -@@ -68,6 +70,7 @@ XMPPSession.prototype = { +@@ -68,6 +70,7 @@ Stanza.node("ping", Stanza.NS.ping)), this.cancelDisconnectTimer, this); }, @@ -60,7 +40,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses _lastReceiveTime: 0, _lastSendTime: 0, checkPingTimer(aJustSentSomething = false) { -@@ -271,6 +274,69 @@ XMPPSession.prototype = { +@@ -271,6 +274,69 @@ this.onXmppStanza = this.stanzaListeners.startAuth; this.onXmppStanza(aStanza); }, @@ -130,7 +110,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")); -@@ -283,6 +349,18 @@ XMPPSession.prototype = { +@@ -283,6 +349,18 @@ this.onXmppStanza = this.stanzaListeners.startAuth; }, startAuth: function(aStanza) {

1 0