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

fixes bug 258473 "Taskbar icons all the same (moz head) instead of functional icons (browser vs. mail)" r=biesi

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@161943 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net 2004-09-08 22:06:17 +00:00
parent 891acc1c03
commit 5608aae523
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
View File

@ -975,21 +975,20 @@ nsBaseWidget::ResolveIconName(const nsAString &aIconName,
nsCOMPtr<nsISimpleEnumerator> dirs;
dirSvc->Get(NS_APP_CHROME_DIR_LIST, NS_GET_IID(nsISimpleEnumerator),
getter_AddRefs(dirs));
if (!dirs)
return;
PRBool hasMore;
while (NS_SUCCEEDED(dirs->HasMoreElements(&hasMore)) && hasMore) {
nsCOMPtr<nsISupports> element;
dirs->GetNext(getter_AddRefs(element));
if (!element)
continue;
nsCOMPtr<nsILocalFile> file = do_QueryInterface(element);
if (!file)
continue;
if (ResolveIconNameHelper(file, aIconName, aIconSuffix)) {
NS_ADDREF(*aResult = file);
return;
if (dirs) {
PRBool hasMore;
while (NS_SUCCEEDED(dirs->HasMoreElements(&hasMore)) && hasMore) {
nsCOMPtr<nsISupports> element;
dirs->GetNext(getter_AddRefs(element));
if (!element)
continue;
nsCOMPtr<nsILocalFile> file = do_QueryInterface(element);
if (!file)
continue;
if (ResolveIconNameHelper(file, aIconName, aIconSuffix)) {
NS_ADDREF(*aResult = file);
return;
}
}
}
@ -998,9 +997,7 @@ nsBaseWidget::ResolveIconName(const nsAString &aIconName,
nsCOMPtr<nsILocalFile> file;
dirSvc->Get(NS_APP_CHROME_DIR, NS_GET_IID(nsILocalFile),
getter_AddRefs(file));
if (!file)
return;
if (ResolveIconNameHelper(file, aIconName, aIconSuffix))
if (file && ResolveIconNameHelper(file, aIconName, aIconSuffix))
NS_ADDREF(*aResult = file);
}