[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.



Title: GitLab

Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

  • fd31ee11
    by Pier Angelo Vendrame at 2023-04-20T09:01:57+02:00
    fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
    
    Bug 41654: Move UpdateInfo into Data again
    

1 changed file:

Changes:

  • toolkit/xre/nsXREDirProvider.cpp
    ... ... @@ -1211,15 +1211,15 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
    1211 1211
       NS_ENSURE_SUCCESS(rv, rv);
    
    1212 1212
     
    
    1213 1213
     #if defined(BASE_BROWSER_UPDATE)
    
    1214
    -  nsCOMPtr<nsIFile> dataDir;
    
    1215 1214
       // For Base Browser and derivatives, we store update history, etc. within the
    
    1216 1215
       // UpdateInfo directory under the user data directory.
    
    1217 1216
     #  if defined(ANDROID)
    
    1218 1217
     #    error "The Base Browser updater is not supported on Android."
    
    1219
    -#  else
    
    1220
    -  rv = GetUserDataDirectoryHome(getter_AddRefs(dataDir), false);
    
    1218
    +#  elif defined(XP_MACOSX)
    
    1219
    +  rv = GetUserDataDirectory(getter_AddRefs(updRoot), false);
    
    1221 1220
       NS_ENSURE_SUCCESS(rv, rv);
    
    1222
    -  rv = dataDir->GetParent(getter_AddRefs(updRoot));
    
    1221
    +#  else
    
    1222
    +  rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false);
    
    1223 1223
       NS_ENSURE_SUCCESS(rv, rv);
    
    1224 1224
     #  endif
    
    1225 1225
       rv = updRoot->AppendNative("UpdateInfo"_ns);
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits