corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 345517 - Build Firefox --enable-libxul by default, r=darin/mento

Browse Source
This commit is contained in:
benjamin@smedbergs.us
2006-08-09 13:39:19 +00:00
parent 900e846011
commit 93d9775bb1
55 changed files with 556 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
browser/components/migration/src/nsBrowserProfileMigratorUtils.cpp
View File

@@ -96,9 +96,10 @@ void SetProxyPref(const nsAString& aHostPort, const char* aPref,
if (portDelimOffset > 0) {
SetUnicharPref(aPref, Substring(hostPort, 0, portDelimOffset), aPrefs);
nsAutoString port(Substring(hostPort, portDelimOffset + 1));
PRInt32 stringErr;
nsresult stringErr;
portValue = port.ToInteger(&stringErr);
aPrefs->SetIntPref(aPortPref, portValue);
if (NS_SUCCEEDED(stringErr))
aPrefs->SetIntPref(aPortPref, portValue);
}
else
SetUnicharPref(aPref, hostPort, aPrefs);
@@ -268,11 +269,11 @@ ImportBookmarksHTML(nsIFile* aBookmarksFile,
rv = bundleService->CreateBundle(MIGRATION_BUNDLE, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsXPIDLString sourceName;
nsString sourceName;
bundle->GetStringFromName(aImportSourceNameKey, getter_Copies(sourceName));
const PRUnichar* sourceNameStrings[] = { sourceName.get() };
nsXPIDLString importedBookmarksTitle;
nsString importedBookmarksTitle;
bundle->FormatStringFromName(NS_LITERAL_STRING("importedBookmarksFolder").get(),
sourceNameStrings, 1,
getter_Copies(importedBookmarksTitle));