Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-01 20:13:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 335725 - part 2: make sure file icons are visible after a browser-restart. r=mconnor.

Browse Source
This commit is contained in:
mozilla.mano%sent.com 2006-05-12 04:16:28 +00:00
parent 59944439fd
commit b2e79a58ee
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
toolkit/components/downloads/src/nsDownloadManager.cpp
View File

@ -42,6 +42,8 @@
#include "nsIRDFLiteral.h"
#include "rdf.h"
#include "nsNetUtil.h"
#include "nsIURI.h"
#include "nsIURL.h"
#include "nsIDOMChromeWindow.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowInternal.h"
@ -1634,16 +1636,32 @@ nsDownloadsDataSource::GetTarget(nsIRDFResource* aSource, nsIRDFResource* aPrope
nsCOMPtr<nsIRDFResource> res(do_QueryInterface(target));
res->GetValue(getter_Copies(path));
nsCOMPtr<nsILocalFile> lf(do_CreateInstance("@mozilla.org/file/local;1"));
lf->InitWithNativePath(path);
nsCOMPtr<nsIIOService> ios(do_GetService("@mozilla.org/network/io-service;1"));
nsCOMPtr<nsIProtocolHandler> ph;
ios->GetProtocolHandler("file", getter_AddRefs(ph));
nsCOMPtr<nsIFileProtocolHandler> fph(do_QueryInterface(ph));
nsCAutoString fileURL;
fph->GetURLSpecFromFile(lf, fileURL);
// XXXmano: See bug 239948 and bug 335725, we need to do this
// until we use real URLs all the time.
PRBool alreadyURL = PR_FALSE;
nsCOMPtr<nsIURI> fileURI;
NS_NewURI(getter_AddRefs(fileURI), path);
if (fileURI) {
nsCOMPtr<nsIURL> url(do_QueryInterface(fileURI, &rv));
if (NS_SUCCEEDED(rv))
alreadyURL = PR_TRUE;
}
nsCAutoString fileURL;
if (alreadyURL) {
fileURL.Assign(path);
}
else {
nsCOMPtr<nsILocalFile> lf(do_CreateInstance("@mozilla.org/file/local;1"));
lf->InitWithNativePath(path);
nsCOMPtr<nsIIOService> ios(do_GetService("@mozilla.org/network/io-service;1"));
nsCOMPtr<nsIProtocolHandler> ph;
ios->GetProtocolHandler("file", getter_AddRefs(ph));
nsCOMPtr<nsIFileProtocolHandler> fph(do_QueryInterface(ph));
fph->GetURLSpecFromFile(lf, fileURL);
}
nsAutoString iconURL(NS_LITERAL_STRING("moz-icon://"));
AppendUTF8toUTF16(fileURL, iconURL);
iconURL.AppendLiteral("?size=32");