[tor-commits] [tor-messenger-build/master] Rebase patches for mozilla-release; Thunderbird 41 tag
sukhbir at torproject.org
sukhbir at torproject.org
Thu Oct 8 02:06:56 UTC 2015
commit 6577dd1b7657091c2c46719e10471fc677cb05ca
Author: Sukhbir Singh <sukhbir at torproject.org>
Date: Wed Oct 7 21:58:35 2015 -0400
Rebase patches for mozilla-release; Thunderbird 41 tag
---
...e-the-default-Firefox-profile-director.mozpatch | 65 +++++++++-----------
projects/instantbird/search-preferences-xul.patch | 8 +--
projects/instantbird/top-protocols.patch | 3 +-
3 files changed, 35 insertions(+), 41 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 a3ca392..abdf109 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
@@ -25,7 +25,7 @@ index 7d09374ba773..417ebee773ba 100644
#include "mozilla/Services.h"
#include "mozilla/Omnijar.h"
#include "mozilla/Preferences.h"
-@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult,
+@@ -197,9 +198,6 @@
aProfileName, aAppName, aVendorName);
if (NS_SUCCEEDED(rv)) {
@@ -35,7 +35,7 @@ index 7d09374ba773..417ebee773ba 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 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult,
+@@ -222,9 +220,6 @@
aProfileName, aAppName, aVendorName);
if (NS_SUCCEEDED(rv)) {
@@ -45,7 +45,7 @@ index 7d09374ba773..417ebee773ba 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 @@ nsresult
+@@ -1219,82 +1214,44 @@
nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
{
// Copied from nsAppFileLocationProvider (more or less)
@@ -84,42 +84,44 @@ index 7d09374ba773..417ebee773ba 100644
+ rv = localDir->GetNativeLeafName(removedName);
+ NS_ENSURE_SUCCESS(rv, rv);
+ bool didRemove = !removedName.Equals(".");
-
-- 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;
++
++ if (didRemove)
++ --levelsToRemove;
++ }
+
+- rv = dirFileMac->InitWithFSRef(&fsRef);
++ if (!localDir)
++ return NS_ERROR_FAILURE;
++
++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger"
++ XPCOM_FILE_PATH_SEPARATOR "Data"
++ XPCOM_FILE_PATH_SEPARATOR "Browser"));
+ NS_ENSURE_SUCCESS(rv, rv);
- localDir = do_QueryInterface(dirFileMac, &rv);
--#elif defined(XP_IOS)
-- nsAutoCString userDir;
-- if (GetUIKitDirectory(aLocal, userDir)) {
-- rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir));
-- } else {
-- rv = NS_ERROR_FAILURE;
-- }
-- NS_ENSURE_SUCCESS(rv, rv);
-#elif defined(XP_WIN)
- nsString path;
-- if (aLocal) {
+ if (aLocal) {
- rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path);
- if (NS_FAILED(rv))
- rv = GetRegWindowsAppDataFolder(aLocal, path);
-- }
++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
++ NS_ENSURE_SUCCESS(rv, rv);
+ }
- if (!aLocal || NS_FAILED(rv)) {
- rv = GetShellFolderPath(CSIDL_APPDATA, path);
- if (NS_FAILED(rv)) {
- 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,
@@ -127,18 +129,13 @@ index 7d09374ba773..417ebee773ba 100644
-#elif defined(XP_UNIX)
- const char* homeDir = getenv("HOME");
- if (!homeDir || !*homeDir)
-+ if (!localDir)
- return NS_ERROR_FAILURE;
-
+- return NS_ERROR_FAILURE;
+-
-#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */
- aLocal = false;
-#endif
-+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger"
-+ XPCOM_FILE_PATH_SEPARATOR "Data"
-+ XPCOM_FILE_PATH_SEPARATOR "Browser"));
-+ NS_ENSURE_SUCCESS(rv, rv);
-
- if (aLocal) {
+-
+- if (aLocal) {
- // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache.
- const char* cacheHome = getenv("XDG_CACHE_HOME");
- if (cacheHome && *cacheHome) {
@@ -153,16 +150,14 @@ index 7d09374ba773..417ebee773ba 100644
- } else {
- rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
- getter_AddRefs(localDir));
-+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
-+ NS_ENSURE_SUCCESS(rv, rv);
- }
+- }
-#else
-#error "Don't know how to get product dir on your platform"
-#endif
NS_IF_ADDREF(*aFile = localDir);
return rv;
-@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile,
+@@ -1507,48 +1464,25 @@
}
nsAutoCString profile;
@@ -214,7 +209,7 @@ index 7d09374ba773..417ebee773ba 100644
#elif defined(ANDROID)
// The directory used for storing profiles
-@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile,
+@@ -1560,12 +1494,6 @@
rv = aFile->AppendNative(nsDependentCString("mozilla"));
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
@@ -227,7 +222,7 @@ index 7d09374ba773..417ebee773ba 100644
if (!profile.IsEmpty()) {
// Skip any leading path characters
const char* profileStart = profile.get();
-@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile,
+@@ -1574,31 +1502,17 @@
// On the off chance that someone wanted their folder to be hidden don't
// let it become ".."
diff --git a/projects/instantbird/search-preferences-xul.patch b/projects/instantbird/search-preferences-xul.patch
index a6b2a31..647d9a5 100644
--- a/projects/instantbird/search-preferences-xul.patch
+++ b/projects/instantbird/search-preferences-xul.patch
@@ -1,7 +1,7 @@
diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanced.xul
--- a/im/content/preferences/advanced.xul
+++ b/im/content/preferences/advanced.xul
-@@ -143,17 +143,6 @@
+@@ -135,17 +135,6 @@
preference="layout.spellcheckDefault"/>
</groupbox>
@@ -16,6 +16,6 @@ diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanc
- oncommand="gAdvancedPane.showSearchEngineManager();"/>
- </groupbox>
-
- <!-- Advanced Configuration -->
- <groupbox>
- <caption label="&configEditDesc.label;"/>
+ #ifdef HAVE_SHELL_SERVICE
+ <!-- System Defaults -->
+ <groupbox id="systemDefaultsGroup" orient="horizontal">
diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch
index f808beb..db1b3e8 100644
--- a/projects/instantbird/top-protocols.patch
+++ b/projects/instantbird/top-protocols.patch
@@ -1,12 +1,11 @@
diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties
-index da7d6b7..90fbf3e 100644
--- a/im/locales/en-US/chrome/instantbird/accountWizard.properties
+++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties
@@ -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-facebook,prpl-twitter,prpl-aim,prpl-msn,prpl-yahoo
+topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook
# LOCALIZATION NOTE
More information about the tor-commits
mailing list