From 3afd37d99834e73f09076ae9c760e79e109b2994 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 26 Mar 2001 07:21:39 +0000
Subject: [PATCH] "detailed" mimetype fallback now available... :)

SVN revision: 4453
---
 data/icons/image/jpeg-jfif-standard.db | Bin 49152 -> 0 bytes
 src/view.c                             |  38 +++++++++++++++++++------
 2 files changed, 30 insertions(+), 8 deletions(-)
 delete mode 100644 data/icons/image/jpeg-jfif-standard.db

diff --git a/data/icons/image/jpeg-jfif-standard.db b/data/icons/image/jpeg-jfif-standard.db
deleted file mode 100644
index 399e8d99f327b049691616a2c1c4f6cf1ea1c8cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 49152
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
I`T76<2QZ7X8UO$Q

diff --git a/src/view.c b/src/view.c
index 73b08f4bf..f7b567329 100644
--- a/src/view.c
+++ b/src/view.c
@@ -587,17 +587,39 @@ e_view_handle_fs(EfsdEvent *ev)
 			       icon->info.mime.type);
 		       if (!e_file_exists(m1))
 			 {
-			    printf("fallback 1\n");
-			    sprintf(m1, "%s/data/icons/%s/default.db",PACKAGE_DATA_DIR,
-				    icon->info.mime.base);
-			    if (!e_file_exists(m1))
+			    int found;
+			    
+			    printf("fallback 0\n");
+			    strcpy(m2, icon->info.mime.type);
+			    p = strrchr(m2, '-');
+			    found = 0;
+			    while (p)
 			      {
-			    printf("fallback 2\n");
-				 sprintf(m1, "%s/data/icons/unknown/unknown.db",PACKAGE_DATA_DIR);
+				 p[0] = 0;
+				 sprintf(m1, "%s/data/icons/%s/%s.db",PACKAGE_DATA_DIR,
+					 icon->info.mime.base, m2);
+				 printf("try %s\n", m1);
+				 if (e_file_exists(m1))
+				   {
+				      found = 1;
+				      break;
+				   }
+				 p = strrchr(m2, '-');
+			      }
+			    if (!found)
+			      {
+				 printf("fallback 1\n");
+				 sprintf(m1, "%s/data/icons/%s/default.db",PACKAGE_DATA_DIR,
+					 icon->info.mime.base);
 				 if (!e_file_exists(m1))
 				   {
-			    printf("fallback 3\n");
-				      sprintf(m1, "%s/data/icons/unknown/default.db",PACKAGE_DATA_DIR);
+				      printf("fallback 2\n");
+				      sprintf(m1, "%s/data/icons/unknown/unknown.db",PACKAGE_DATA_DIR);
+				      if (!e_file_exists(m1))
+					{
+					   printf("fallback 3\n");
+					   sprintf(m1, "%s/data/icons/unknown/default.db",PACKAGE_DATA_DIR);
+					}
 				   }
 			      }
 			 }