From 89beaf7d216930f3d68c59401441ccd9a5331339 Mon Sep 17 00:00:00 2001
From: David Walter Seikel <onefang@gmail.com>
Date: Fri, 1 Sep 2006 06:59:21 +0000
Subject: [PATCH] Find a few more icons.

SVN revision: 25270
---
 .../src/lib/ecore_desktop/ecore_desktop.c     | 25 ++++++++++++++++---
 .../lib/ecore_desktop/ecore_desktop_paths.c   |  2 ++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
index 2c02673cd9..f5dc13b085 100644
--- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
+++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
@@ -308,15 +308,34 @@ ecore_desktop_get(const char *file, const char *lang)
 			       }
 		            if (exe)
 		               {
-			          if (done)
-			             strcat(result->icon_class, ",");
-			          strcat(result->icon_class, exe);
+	                           char *tmp;
+
+                                   tmp = strdup(ecore_file_get_file(exe));
+	                           if (tmp)
+	                             {
+				        p = tmp;
+	                                while (*p != '\0')
+	                                   {
+			                      if (*p == ' ')
+					      {
+				                 *p = '\0';
+						 break;
+					      }
+		                              p++;
+	                                   }
+			                if (done)
+			                   strcat(result->icon_class, ",");
+			                strcat(result->icon_class, tmp);
+				        done = 1;
+					free(tmp);
+				     }
 			       }
 		            if (categories)
 		               {
 			          if (done)
 			             strcat(result->icon_class, ",");
 			          strcat(result->icon_class, categories);
+			          done = 1;
 			       }
 			    p = result->icon_class;
 	                    while (*p != '\0')
diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c
index acc14367ec..976b2b9903 100644
--- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c
+++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c
@@ -196,6 +196,8 @@ ecore_desktop_paths_init()
 					   "/usr/local/share/pixmaps/");
 	_ecore_desktop_paths_check_and_add(ecore_desktop_paths_icons,
 					   "/usr/share/pixmaps/");
+	_ecore_desktop_paths_check_and_add(ecore_desktop_paths_icons,
+					   "/usr/share/update-desktop-files/kappfinder-icons/");
 	gnome = getenv("GNOME_ICON_PATH");
 	if (gnome)
 	   _ecore_desktop_paths_check_and_add(ecore_desktop_paths_icons, gnome);