commit 8df942da0fff7a06cb392c8f5eeea2ae6b804eb3 Author: Nicolas Vigier boklm@torproject.org Date: Mon Jun 29 17:58:29 2015 +0200

Update profile folder path

Set levelsToRemove to 1 on OSX (otherwise we are outside the app directory).

Replace TorBrowser with TorMessenger. --- ...73-Change-the-default-Firefox-profile-director.mozpatch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 3ec76d7..e5c78bc 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 @@ -76,7 +76,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 - NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); + int levelsToRemove = 1; // In FF21+, appDir points to browser subdirectory. +#if defined(XP_MACOSX) -+ levelsToRemove += 2; ++ levelsToRemove += 1; +#endif + while (localDir && (levelsToRemove > 0)) { + // When crawling up the hierarchy, components named "." do not count. @@ -125,7 +125,7 @@ index c496a14ce84a..689cb0f8ecb1 100644 -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser" ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" + XPCOM_FILE_PATH_SEPARATOR "Data" + XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv); @@ -322,8 +322,8 @@ index a5c71e723907..f93e7f430996 100644 -// UNIX : ~/.mozilla/ -// WIN : <Application Data folder on user's machine>\Mozilla -// Mac : :Documents:Mozilla: -+// UNIX and WIN : <App Folder>/TorBrowser/Data/Browser -+// Mac : <App Folder>/../../TorBrowser/Data/Browser ++// UNIX and WIN : <App Folder>/TorMessenger/Data/Browser ++// Mac : <App Folder>/../TorMessenger/Data/Browser //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, @@ -343,7 +343,7 @@ index a5c71e723907..f93e7f430996 100644 + + int levelsToRemove = 1; // In FF21+, bin dir points to browser subdirectory. +#if defined(XP_MACOSX) -+ levelsToRemove += 2; ++ levelsToRemove += 1; +#endif + while (localDir && (levelsToRemove > 0)) { + // When crawling up the hierarchy, components named "." do not count. @@ -396,7 +396,7 @@ index a5c71e723907..f93e7f430996 100644 - rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); - if (NS_FAILED(rv)) { - return rv; -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser" ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" + XPCOM_FILE_PATH_SEPARATOR "Data" + XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv);