diff options
| author | Timothy Pearson <[email protected]> | 2011-12-31 04:26:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-31 04:26:28 -0600 |
| commit | d713502d1f579411e00ce5e5d59e4b980bb894b1 (patch) | |
| tree | 830cd5d46ef27978d7621dd1c970fbbe58bc8788 /kdesktop/minicli.cpp | |
| parent | 4ea3979393d7ae160810a56fe965f0b25630b2ba (diff) | |
| download | tdebase-d713502d1f579411e00ce5e5d59e4b980bb894b1.tar.gz tdebase-d713502d1f579411e00ce5e5d59e4b980bb894b1.zip | |
Second part of prior commit
Diffstat (limited to 'kdesktop/minicli.cpp')
| -rw-r--r-- | kdesktop/minicli.cpp | 14 |
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" ) { |