From 291eb697d16574d229c819334204250ab5616077 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 1 Sep 2011 18:25:02 +0000
Subject: Fix shutdown dialog icon background Fix Kicker show desktop button
 tooltip

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1250808 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kicker/applets/launcher/quickbutton.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'kicker')

diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 996d8abe3..0c19e5326 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -343,8 +343,12 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
     {
         data.subtext = data.message;
     }
-    data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, 
-        KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+    if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
+        data.icon = KGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+    }
+    else {
+        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+    }
 }
 
 void QuickButton::setPopupDirection(KPanelApplet::Direction d)
-- 
cgit v1.2.3