'[tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] fixup!'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tor-cvs
Subject:    [tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] fixup!
From:       "Pier Angelo Vendrame \( () pierov\) via tor-commits" <tor-commits () lists ! torproject
Date:       2023-04-20 7:05:17
Message-ID: 6440e42deba2c_25814548aa86452d8 () gitlab-02 ! mail
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


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:

- toolkit/xre/nsXREDirProvider.cpp


Changes:

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



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee11649e80f5268db3dbfbbdf42b45b8d86d


-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee11649e80f5268db3dbfbbdf42b45b8d86d
 You're receiving this email because of your account on gitlab.torproject.org.


[Attachment #5 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" \
"http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en" \
style='--code-editor-font: var(--default-mono-font, "Menlo"), DejaVu Sans Mono, \
Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, \
monospace;'> <head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>

<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>


<style>img {
max-width: 100%; height: auto;
}
body {
font-size: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, -apple-system),BlinkMacSystemFont,"Segoe \
UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color \
Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit; }
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; \
font-family: var(--default-regular-font, -apple-system),BlinkMacSystemFont,"Segoe \
UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color \
Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'> <div class="content">

<h3 style="margin-top: 20px; margin-bottom: 10px;">
Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.5-1 at <a \
href="https://gitlab.torproject.org/tpo/applications/tor-browser">The Tor Project / \
Applications / Tor Browser</a> </h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: bold;"><a \
href="https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee11649e80f5268db3dbfbbdf42b45b8d86d">fd31ee11</a></strong>
 <div>
<span> by Pier Angelo Vendrame </span> <i> at 2023-04-20T09:01:57+02:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: \
0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, \
"Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier \
New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: \
break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px \
12px; border: 1px solid #dcdcde;'>fixup! Bug 4234: Use the Firefox Update Process for \
Base Browser.

Bug 41654: Move UpdateInfo into Data again
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
1 changed file:
</h4>
<ul>
<li class="file-stats">
<a href="#70f71e5cefcce25e7e0790a10bd5d991738ceef5">
toolkit/xre/nsXREDirProvider.cpp
</a>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Changes:
</h4>
<li id="70f71e5cefcce25e7e0790a10bd5d991738ceef5">
<a href="https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee116 \
49e80f5268db3dbfbbdf42b45b8d86d#70f71e5cefcce25e7e0790a10bd5d991738ceef5"><strong \
style="font-weight: bold;">toolkit/xre/nsXREDirProvider.cpp</strong></a> <hr \
style="overflow: hidden; border: 1px solid #e1e1e1;"> <table class="code white" \
style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: \
monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" \
cellspacing="0"> <tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1211" \
style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; \
border-right-color: #ececef; border-right-style: solid; padding: inherit;" \
align="right" bgcolor="#fbfafd">...</td> <td class="diff-line-num unfold js-unfold \
new_line" data-linenumber="1211" style="width: 35px; color: rgba(31,30,36,0.24); \
border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; \
padding: inherit;" align="right" bgcolor="#fbfafd">...</td> <td class="line_content \
match" style="color: rgba(31,30,36,0.24); padding: inherit;" bgcolor="#fbfafd">@@ \
-1211,15 +1211,15 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** \
aResult,</td> </tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1211" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1211
</td>
<td class="new_line diff-line-num" data-linenumber="1211" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1211
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1211" class="line" lang="cpp">  <span class="n" style="color: \
#333;">NS_ENSURE_SUCCESS</span><span class="p">(</span><span class="n" style="color: \
#333;">rv</span><span class="p">,</span> <span class="n" style="color: \
#333;">rv</span><span class="p">);</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1212" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1212
</td>
<td class="new_line diff-line-num" data-linenumber="1212" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1212
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1212" class="line" lang="cpp"></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1213" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1213
</td>
<td class="new_line diff-line-num" data-linenumber="1213" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1213
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1213" class="line" lang="cpp"><span class="cp" style="color: #999; \
font-weight: 600;">#if defined(BASE_BROWSER_UPDATE)</span></span> </pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="1214" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> 1214
</td>
<td class="new_line diff-line-num old" data-linenumber="1214" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">  
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>-<span id="LC1214" class="line" lang="cpp">  <span class="n" style="color: \
#333;">nsCOMPtr</span><span class="o" style="font-weight: 600;">&lt;</span><span \
class="n" style="color: #333;">nsIFile</span><span class="o" style="font-weight: \
600;">&gt;</span> <span class="n" style="color: #333;">dataDir</span><span \
class="p">;</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1215" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1215
</td>
<td class="new_line diff-line-num" data-linenumber="1214" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1214
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1214" class="line" lang="cpp">  <span class="c1" style="color: #998; \
font-style: italic;">// For Base Browser and derivatives, we store update history, \
etc. within the</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1216" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1216
</td>
<td class="new_line diff-line-num" data-linenumber="1215" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1215
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1215" class="line" lang="cpp">  <span class="c1" style="color: #998; \
font-style: italic;">// UpdateInfo directory under the user data \
directory.</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1217" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1217
</td>
<td class="new_line diff-line-num" data-linenumber="1216" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1216
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1216" class="line" lang="cpp"><span class="cp" style="color: #999; \
font-weight: 600;">#  if defined(ANDROID)</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1218" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1218
</td>
<td class="new_line diff-line-num" data-linenumber="1217" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1217
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1217" class="line" lang="cpp"><span class="cp" style="color: #999; \
font-weight: 600;">#    error "The Base Browser updater is not supported on \
Android."</span></span> </pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="1219" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> 1219
</td>
<td class="new_line diff-line-num old" data-linenumber="1218" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">  
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>-<span id="LC1219" class="line" lang="cpp"><span class="cp" style="color: \
#999; font-weight: 600;">#  el<span class="idiff left right deletion" \
style="background-color: #fac5cd;">se</span></span></span> </pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="1220" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> 1220
</td>
<td class="new_line diff-line-num old" data-linenumber="1218" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">  
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>-<span id="LC1220" class="line" lang="cpp">  <span class="n" style="color: \
#333;">rv</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" \
style="color: #333;">GetUserDataDirectory<span class="idiff left deletion" \
style="background-color: #fac5cd;">Home</span></span><span class="p">(</span><span \
class="n" style="color: #333;">getter_AddRefs</span><span class="p">(</span><span \
class="n" style="color: #333;"><span class="idiff right deletion" \
style="background-color: #fac5cd;">dataDir</span></span><span class="p">),</span> \
<span class="nb" style="color: #0086b3;">false</span><span class="p">);</span></span> \
</pre></td> </tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="1221" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">  
</td>
<td class="new_line diff-line-num new" data-linenumber="1218" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1218
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>+<span id="LC1218" class="line" lang="cpp"><span class="cp" style="color: \
#999; font-weight: 600;">#  el<span class="idiff left right addition" \
style="background-color: #c7f0d2;">if defined(XP_MACOSX)</span></span></span> \
</pre></td> </tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="1221" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">  
</td>
<td class="new_line diff-line-num new" data-linenumber="1219" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1219
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>+<span id="LC1219" class="line" lang="cpp">  <span class="n" style="color: \
#333;">rv</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" \
style="color: #333;">GetUserDataDirectory</span><span class="p">(</span><span \
class="n" style="color: #333;">getter_AddRefs</span><span class="p">(</span><span \
class="n" style="color: #333;"><span class="idiff left right addition" \
style="background-color: #c7f0d2;">updRoot</span></span><span class="p">),</span> \
<span class="nb" style="color: #0086b3;">false</span><span class="p">);</span></span> \
</pre></td> </tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1221" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1221
</td>
<td class="new_line diff-line-num" data-linenumber="1220" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1220
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1220" class="line" lang="cpp">  <span class="n" style="color: \
#333;">NS_ENSURE_SUCCESS</span><span class="p">(</span><span class="n" style="color: \
#333;">rv</span><span class="p">,</span> <span class="n" style="color: \
#333;">rv</span><span class="p">);</span></span> </pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="1222" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc"> 1222
</td>
<td class="new_line diff-line-num old" data-linenumber="1221" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">  
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>-<span id="LC1222" class="line" lang="cpp">  <span class="n" style="color: \
#333;">rv</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" \
style="color: #333;">dataDir</span><span class="o" style="font-weight: \
600;">-&gt;</span><span class="n" style="color: #333;">GetParent</span><span \
class="p">(</span><span class="n" style="color: #333;">getter_AddRefs</span><span \
class="p">(</span><span class="n" style="color: #333;">updRoot</span><span \
class="p">));</span></span> </pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="1223" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">  
</td>
<td class="new_line diff-line-num new" data-linenumber="1221" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1221
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>+<span id="LC1221" class="line" lang="cpp"><span class="cp" style="color: \
#999; font-weight: 600;">#  else</span></span> </pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="1223" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">  
</td>
<td class="new_line diff-line-num new" data-linenumber="1222" style="width: 35px; \
color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6"> 1222
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre \
style='display: block; font-size: 0.875rem; color: #333238; position: relative; \
font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid \
#dcdcde;'>+<span id="LC1222" class="line" lang="cpp">  <span class="n" style="color: \
#333;">rv</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" \
style="color: #333;">GetUserDataDirectoryHome</span><span class="p">(</span><span \
class="n" style="color: #333;">getter_AddRefs</span><span class="p">(</span><span \
class="n" style="color: #333;">updRoot</span><span class="p">),</span> <span \
class="nb" style="color: #0086b3;">false</span><span class="p">);</span></span> \
</pre></td> </tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1223" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1223
</td>
<td class="new_line diff-line-num" data-linenumber="1223" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1223
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1223" class="line" lang="cpp">  <span class="n" style="color: \
#333;">NS_ENSURE_SUCCESS</span><span class="p">(</span><span class="n" style="color: \
#333;">rv</span><span class="p">,</span> <span class="n" style="color: \
#333;">rv</span><span class="p">);</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1224" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1224
</td>
<td class="new_line diff-line-num" data-linenumber="1224" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1224
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1224" class="line" lang="cpp"><span class="cp" style="color: #999; \
font-weight: 600;">#  endif</span></span> </pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="1225" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1225
</td>
<td class="new_line diff-line-num" data-linenumber="1225" style="width: 35px; color: \
rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; \
border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd"> 1225
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; \
font-size: 0.875rem; color: #333238; position: relative; font-family: \
var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation \
Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida \
console",monospace; word-break: break-all; word-wrap: break-word; background-color: \
inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> \
<span id="LC1225" class="line" lang="cpp">  <span class="n" style="color: \
#333;">rv</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" \
style="color: #333;">updRoot</span><span class="o" style="font-weight: \
600;">-&gt;</span><span class="n" style="color: #333;">AppendNative</span><span \
class="p">(</span><span class="s" style="color: #d14;">"UpdateInfo"</span><span \
class="n" style="color: #333;">_ns</span><span class="p">);</span></span> </pre></td>
</tr>

</table>
<br>
</li>

</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
&#8212;
<br>
<a href="https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee11649e80f5268db3dbfbbdf42b45b8d86d">View \
it on GitLab</a>. <br>
You're receiving this email because of your account on <a target="_blank" \
rel="noopener noreferrer" \
href="https://gitlab.torproject.org">gitlab.torproject.org</a>. <a \
href="https://gitlab.torproject.org/-/profile/notifications" target="_blank" \
rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> &#183; \
<a href="https://gitlab.torproject.org/help" target="_blank" rel="noopener \
noreferrer" class="help-link">Help</a> <script \
type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View \
Commit","url":"https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee11649e80f5268db3dbfbbdf42b45b8d86d"}}</script>



</p>
</div>
</body>
</html>



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


[prev in list] [next in list] [prev in thread] [next in thread] 
