From d713502d1f579411e00ce5e5d59e4b980bb894b1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 31 Dec 2011 04:26:28 -0600
Subject: Second part of prior commit

---
 kdesktop/minicli.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'kdesktop')

diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 078477f28..d5350339d 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -848,7 +848,19 @@ void Minicli::setIcon ()
   if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" )
     m_iconName = TQString::fromLatin1("kmenu");
 
-  TQPixmap icon = DesktopIcon( m_iconName );
+  TQPixmap icon;
+  if ((m_iconName == "exec") && (m_filterData->iconName() == "exec")) {
+    TQPixmap potentialIcon = m_filterData->customIconPixmap();
+    if (!potentialIcon.isNull()) {
+      icon = potentialIcon;
+    }
+    else {
+      icon = DesktopIcon( m_iconName );
+    }
+  }
+  else {
+    icon = DesktopIcon( m_iconName );
+  }
 
   if ( m_iconName == "www" )
   {
-- 
cgit v1.2.1