[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.5/kdebase/workspace/plasma/desktop/applets/pager
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-09-13 23:09:57
Message-ID: 20100913230957.41672AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1175029 by aseigo:

remove an unused bit of bookkeeping; seems to cause a crash on some systems due to an \
XIO error (though i'd expect NETWinInfo to protect against such things? hm..) \
BUG:251131


 M  +0 -25     pager.cpp  
 M  +0 -1      pager.h  


--- branches/KDE/4.5/kdebase/workspace/plasma/desktop/applets/pager/pager.cpp \
#1175028:1175029 @@ -101,7 +101,6 @@
       m_colorScheme(0),
       m_verticalFormFactor(false),
       m_dragId(0),
-      m_dirtyDesktop(-1),
       m_dragStartDesktop(-1),
       m_dragHighlightedDesktop(-1),
       m_dragSwitchDesktop(-1),
@@ -642,7 +641,6 @@
     }
 
     m_currentDesktop = desktop;
-    m_dirtyDesktop = -1;
     m_desktopDown = false;
 
     if (!m_timer->isActive()) {
@@ -652,11 +650,6 @@
 
 void Pager::windowAdded(WId id)
 {
-    Q_UNUSED(id)
-
-    KWindowInfo info = KWindowSystem::windowInfo(id, NET::WMGeometry | \
NET::WMFrameExtents | NET::WMWindowType | NET::WMDesktop | NET::WMState | \
                NET::XAWMState);
-    m_dirtyDesktop = info.desktop() - 1;
-
     if (!m_timer->isActive()) {
         m_timer->start(FAST_UPDATE_DELAY);
     }
@@ -667,7 +660,6 @@
     Q_UNUSED(id)
 
     KWindowInfo info = KWindowSystem::windowInfo(id, NET::WMGeometry | \
NET::WMFrameExtents | NET::WMWindowType | NET::WMDesktop | NET::WMState | \
                NET::XAWMState);
-    m_dirtyDesktop = info.desktop() - 1;
 
     if (!m_timer->isActive()) {
         m_timer->start(FAST_UPDATE_DELAY);
@@ -679,7 +671,6 @@
     Q_UNUSED(id)
 
     KWindowInfo info = KWindowSystem::windowInfo(id, NET::WMGeometry | \
NET::WMFrameExtents | NET::WMWindowType | NET::WMDesktop | NET::WMState | \
                NET::XAWMState);
-    m_dirtyDesktop = info.desktop() - 1;
 
     if (!m_timer->isActive()) {
         m_timer->start(FAST_UPDATE_DELAY);
@@ -697,7 +688,6 @@
     m_addDesktopAction->setEnabled(num < MAXDESKTOPS);
 #endif
 
-    m_dirtyDesktop = -1;
     m_desktopCount = num;
 
     m_rects.clear();
@@ -707,8 +697,6 @@
 
 void Pager::desktopNamesChanged()
 {
-    m_dirtyDesktop = -1;
-
     m_rects.clear();
     recalculateGeometry();
 
@@ -719,8 +707,6 @@
 
 void Pager::stackingOrderChanged()
 {
-    m_dirtyDesktop = -1;
-
     if (!m_timer->isActive()) {
         m_timer->start(FAST_UPDATE_DELAY);
     }
@@ -730,13 +716,6 @@
 {
     Q_UNUSED(id)
 
-    if (properties & NET::WMGeometry) {
-        KWindowInfo info = KWindowSystem::windowInfo(id, NET::WMGeometry | \
NET::WMFrameExtents | NET::WMWindowType | NET::WMDesktop | NET::WMState | \
                NET::XAWMState);
-        m_dirtyDesktop = info.desktop() - 1;
-    } else {
-        m_dirtyDesktop = -1;
-    }
-
     if (properties & NET::WMGeometry ||
         properties & NET::WMDesktop) {
         if (!m_timer->isActive()) {
@@ -747,8 +726,6 @@
 
 void Pager::showingDesktopChanged(bool showing)
 {
-    m_dirtyDesktop = -1;
-
     Q_UNUSED(showing)
     if (!m_timer->isActive()) {
         m_timer->start(UPDATE_DELAY);
@@ -757,8 +734,6 @@
 
 void Pager::desktopsSizeChanged()
 {
-    m_dirtyDesktop = -1;
-
     m_rects.clear();
     recalculateGeometry();
 
--- branches/KDE/4.5/kdebase/workspace/plasma/desktop/applets/pager/pager.h \
#1175028:1175029 @@ -168,7 +168,6 @@
         QPointF m_dragOriginalPos;
         QPointF m_dragCurrentPos;
         WId m_dragId;
-        int m_dirtyDesktop;
         int m_dragStartDesktop;
         int m_dragHighlightedDesktop;
 


[prev in list] [next in list] [prev in thread] [next in thread]