summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-26 02:47:03 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-26 02:47:03 +0000
commita1f124c60f1a98ac0def41261b40021286ccfc6e (patch)
tree4deafb38bf3a042821573679c7e2a0049b62896b /kicker
parenteac86b256d300988ad9440e3a007c6146e2be260 (diff)
downloadtdebase-a1f124c60f1a98ac0def41261b40021286ccfc6e.tar.gz
tdebase-a1f124c60f1a98ac0def41261b40021286ccfc6e.zip
Fixed pager/desktop refresh loop
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1107570 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp13
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp4
2 files changed, 6 insertions, 11 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6cc000562..4bb4234a4 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -133,8 +133,7 @@ KMiniPager::KMiniPager(const QString& configFile, Type type, int actions,
drawButtons();
connect( m_kwin, SIGNAL( currentDesktopChanged(int)), SLOT( slotSetDesktop(int) ) );
- connect( m_kwin, SIGNAL( currentDesktopViewportChanged(int, const QPoint&)),
- SLOT(slotSetDesktopViewport(int, const QPoint&)));
+ connect( m_kwin, SIGNAL( currentDesktopViewportChanged(int, const QPoint&)), SLOT(slotSetDesktopViewport(int, const QPoint&)));
connect( m_kwin, SIGNAL( numberOfDesktopsChanged(int)), SLOT( slotSetDesktopCount(int) ) );
connect( m_kwin, SIGNAL( desktopGeometryChanged(int)), SLOT( slotRefreshViewportCount(int) ) );
connect( m_kwin, SIGNAL( activeWindowChanged(WId)), SLOT( slotActiveWindowChanged(WId) ) );
@@ -820,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();
@@ -828,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;
}
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index b4e268b8e..06bd6ab6e 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -249,10 +249,6 @@ void KMiniPagerButton::loadBgPixmap()
}
}
- QDataStream args( data, IO_WriteOnly );
- args << 1;
- client->send(kdesktop_name, "KBackgroundIface", "setExport(int)", data);
-
if (m_isCommon)
{
if (!s_commonSharedPixmap)