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

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" )

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 {
+           else {
-//                m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgTransparent);
+               m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgTransparent);
-//            }
+           }
             break;
         }