diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-04-14 02:02:48 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-04-14 02:02:48 +0000 |
| commit | 1ea91382019a50de2d32be86110533e133a6c703 (patch) | |
| tree | 3f62ca53cceb6b86c420790061ba31e1254078e9 | |
| parent | ec0fd51b646f8489b6e83f155c16432d361ce439 (diff) | |
| download | tdebase-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
| -rw-r--r-- | kcontrol/konqhtml/javaopts.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/minipager/pagerapplet.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 539e9bb37..3cb538a9f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -198,7 +198,7 @@ void KJavaOptions::load(bool useDefaults) #if defined(PATH_JAVA) QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", PATH_JAVA ); #else - QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "java" ); + QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "/usr/bin/java" ); #endif if( sJavaPath == "/usr/lib/jdk" ) 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; } |