summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-14 02:02:48 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-14 02:02:48 +0000
commit1ea91382019a50de2d32be86110533e133a6c703 (patch)
tree3f62ca53cceb6b86c420790061ba31e1254078e9 /kicker
parentec0fd51b646f8489b6e83f155c16432d361ce439 (diff)
downloadtdebase-1ea91382019a50de2d32be86110533e133a6c703.tar.gz
tdebase-1ea91382019a50de2d32be86110533e133a6c703.zip
Fixed default java path and temporarily worked around pager hang with Compiz
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1114580 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 4bb4234a4..5c761c03f 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -819,7 +819,7 @@ void KMiniPager::contextMenuActivated(int result)
break;
case PagerSettings::EnumBackgroundType::BgLive + bgOffset:
{
-// if (m_useViewports == true) {
+ if (m_useViewports == true) {
m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgLive);
QValueList<KMiniPagerButton*>::ConstIterator it;
QValueList<KMiniPagerButton*>::ConstIterator itEnd = m_desktops.end();
@@ -827,10 +827,10 @@ void KMiniPager::contextMenuActivated(int result)
{
(*it)->backgroundChanged();
}
-// }
-// else {
-// m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgTransparent);
-// }
+ }
+ else {
+ m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgTransparent);
+ }
break;
}