Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Under Windows, try and munge imported IE Favorites names to not include a ".url".

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@235583 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com 2007-09-12 17:46:28 +00:00
parent 9fe9290b98
commit e5526fcacf
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mozilla/suite/browser/src/nsBookmarksService.cpp
View File

@ -1467,7 +1467,52 @@ nsBookmarksService::GetTarget(nsIRDFResource* aSource,
}
}
return mInner->GetTarget(aSource, aProperty, aTruthValue, aTarget);
rv = mInner->GetTarget(aSource, aProperty, aTruthValue, aTarget);
#ifdef XP_WIN
// under Windows, munge IE favorite names to strip off the ".url"
if (NS_SUCCEEDED(rv) && (aTruthValue) && (aProperty == kNC_Name))
{
// XXX should ensure that aSource's URI begins with nsSpecialSystemDirectory::Win_Favorites
nsCOMPtr<nsIRDFNode> tempNode = do_QueryInterface(*aTarget);
if (tempNode)
{
nsCOMPtr<nsIRDFLiteral> litTemp = do_QueryInterface(tempNode);
if (litTemp)
{
const PRUnichar *uniName = nsnull;
if (NS_SUCCEEDED(litTemp->GetValueConst(&uniName)) && (uniName))
{
nsAutoString name(uniName), extension;
PRInt32 len = name.Length();
if (len > 4)
{
name.Right(extension, 4);
if (extension.EqualsIgnoreCase(".url"))
{
name.Truncate(len-4);
nsIRDFLiteral *literal;
if (NS_SUCCEEDED(gRDF->GetLiteral(name.GetUnicode(),
&literal)))
{
// be sure to release the original name we got back!
NS_IF_RELEASE(*aTarget);
rv = literal->QueryInterface(nsIRDFNode::GetIID(),
(void**) aTarget);
NS_RELEASE(literal);
}
}
}
}
}
}
}
#endif
return(rv);
}