mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-09 05:14:24 +00:00
fix some minor problems with the pref migration progress xul. #15042
get news migration back on UNIX, I accidentally broke it.
This commit is contained in:
parent
979446d392
commit
6fc5a89989
@ -9,9 +9,7 @@
|
||||
title="Migrating Profiles"
|
||||
onload="onLoad()">
|
||||
|
||||
|
||||
<html:script language="javascript" src="pmunprog.js">
|
||||
</html:script>
|
||||
<html:script language="javascript" src="pmunprog.js"/>
|
||||
|
||||
<box align="vertical" style="height: 30%; width: 50%">
|
||||
|
||||
@ -44,8 +42,7 @@
|
||||
<spring style="width:10px"/>
|
||||
<box align="vertical">
|
||||
<spring style="height:6px"/>
|
||||
<progressmeter id="dialog.progress" mode="undetermined" style="width:200px;height:10px">
|
||||
</progressmeter>
|
||||
<progressmeter id="dialog.progress" mode="undetermined" style="width:200px;height:10px"/>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
|
@ -899,12 +899,7 @@ nsPrefMigration::GetDirFromPref(nsIFileSpec * oldProfilePath, nsIFileSpec * newP
|
||||
nsCOMPtr <nsIFileSpec> oldPrefPath;
|
||||
rv = m_prefs->GetFilePref(pref, getter_AddRefs(oldPrefPath));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
PRBool exists;
|
||||
rv = oldPath->Exists(&exists);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
if (!exists) return rv;
|
||||
|
||||
|
||||
rv = oldPath->FromFileSpec(oldPrefPath);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user