summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdesktop/minicli.cpp14
1 files changed, 13 insertions, 1 deletions
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" )
{