From e47433bccb749acb38e2b6f624ec2fe9219e0c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 16 Feb 2006 13:20:38 +0000
Subject: [PATCH] * The new icon retrieval code didn't always work that well...
 * For applications without an icon, the default application icon is now
 shown.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16419 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../filetypes/MimeTypeListView.cpp            | 26 ++++++++++++++-----
 src/preferences/filetypes/MimeTypeListView.h  |  3 +++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/preferences/filetypes/MimeTypeListView.cpp b/src/preferences/filetypes/MimeTypeListView.cpp
index c30483239e..62d38667b2 100644
--- a/src/preferences/filetypes/MimeTypeListView.cpp
+++ b/src/preferences/filetypes/MimeTypeListView.cpp
@@ -18,16 +18,14 @@ icon_for_type(BMimeType& type, BBitmap& bitmap, icon_size size,
 {
 	icon_source source = kNoIcon;
 
-	if (type.GetIcon(&bitmap, size) == B_OK) {
+	if (type.GetIcon(&bitmap, size) == B_OK)
 		source = kOwnIcon;
-		return B_OK;
-	}
 
 	if (source == kNoIcon) {
 		// check for icon from preferred app
 
 		char preferred[B_MIME_TYPE_LENGTH];
-		if (type.GetPreferredApp(preferred) != B_OK) {
+		if (type.GetPreferredApp(preferred) == B_OK) {
 			BMimeType preferredApp(preferred);
 
 			if (preferredApp.GetIconForType(type.Type(), &bitmap, size) == B_OK)
@@ -137,7 +135,14 @@ MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete)
 
 		BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8);
 		BMimeType mimeType(fType.String());
-		if (icon_for_type(mimeType, bitmap, B_MINI_ICON) == B_OK) {
+		status_t status = icon_for_type(mimeType, bitmap, B_MINI_ICON);
+		if (status < B_OK && fApplicationMode) {
+			// get default application icon
+			BMimeType appType(B_ELF_APP_MIME_TYPE);
+			status = icon_for_type(appType, bitmap, B_MINI_ICON);
+		}
+
+		if (status == B_OK) {
 			BPoint point(rect.left + 2.0f, 
 				rect.top + (rect.Height() - B_MINI_ICON) / 2.0f);
 
@@ -242,6 +247,13 @@ MimeTypeItem::ShowIcon(bool showIcon)
 }
 
 
+void
+MimeTypeItem::SetApplicationMode(bool applicationMode)
+{
+	fApplicationMode = applicationMode;
+}
+
+
 /*static*/
 int
 MimeTypeItem::Compare(const BListItem* a, const BListItem* b)
@@ -323,8 +335,10 @@ MimeTypeListView::_CollectSubtypes(const char* supertype, MimeTypeItem* supertyp
 		if (fApplicationMode ^ isApp)
 			continue;
 
-		BStringItem* typeItem = new MimeTypeItem(mimeType, fShowIcons,
+		MimeTypeItem* typeItem = new MimeTypeItem(mimeType, fShowIcons,
 			supertypeItem == NULL);
+		typeItem->SetApplicationMode(isApp);
+
 		if (supertypeItem != NULL)
 			AddUnder(typeItem, supertypeItem);
 		else
diff --git a/src/preferences/filetypes/MimeTypeListView.h b/src/preferences/filetypes/MimeTypeListView.h
index 716fff7e9e..598bb56aef 100644
--- a/src/preferences/filetypes/MimeTypeListView.h
+++ b/src/preferences/filetypes/MimeTypeListView.h
@@ -29,7 +29,9 @@ class MimeTypeItem : public BStringItem {
 
 		void UpdateText();
 		void AddSubtype();
+
 		void ShowIcon(bool showIcon);
+		void SetApplicationMode(bool applicationMode);
 
 		static int Compare(const BListItem* a, const BListItem* b);
 		static int CompareLabels(const BListItem* a, const BListItem* b);
@@ -45,6 +47,7 @@ class MimeTypeItem : public BStringItem {
 		bool		fIsSupertype;
 		bool		fFlat;
 		bool		fShowIcon;
+		bool		fApplicationMode;
 };
 
 class MimeTypeListView : public BOutlineListView {