summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-10 03:15:04 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-10 03:15:04 +0000
commitd83a80f295597e6cd696cf5f308ff7d5545f8629 (patch)
treeed629a4e4c60fb451e4a44e00c4e0e0b8b81950e
parent18ccb31b48c9f6d834c9b6206745111c27c1e518 (diff)
downloadtdebase-d83a80f295597e6cd696cf5f308ff7d5545f8629.tar.gz
tdebase-d83a80f295597e6cd696cf5f308ff7d5545f8629.zip
Attempt to fix uninitialized starting image issue in shutdown dialog fade-to-gray code
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1227532 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
-rw-r--r--ksmserver/shutdowndlg.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 66dd71503..931419585 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1405,7 +1405,7 @@ void KMenu::slotLock()
void KMenu::slotOpenHomepage()
{
accept();
- kapp->invokeBrowser("http://trinity.pearsoncomputing.net");
+ kapp->invokeBrowser("http://www.trinitydesktop.org");
}
void KMenu::slotLogout()
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 4eb8aa686..18ba7d7ce 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -80,7 +80,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
{
DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot...
m_grayImage = TQPixmap(TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height())).convertToImage();
- m_unfadedImage = TQImage();
+ m_unfadedImage = m_grayImage;
resize(0, 0);
setShown(true);
TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );