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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/workspace/plasma/netbook/shell
From:       Nicolas Lécureuil <nlecureuil () mandriva ! com>
Date:       2010-05-31 21:57:27
Message-ID: 20100531220401.C4BECAC8C6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1133012 by nlecureuil:

Backport of commit 1122490
FIXED-IN: 4.4.5
BUG: 240032


 M  +5 -4      plasmaapp.cpp  


--- branches/KDE/4.4/kdebase/workspace/plasma/netbook/shell/plasmaapp.cpp \
#1133011:1133012 @@ -215,6 +215,7 @@
       m_mainView(0),
       m_isDesktop(false),
       m_autoHideControlBar(true),
+      m_raiseTimer(new QTimer(this)),
       m_unHideTimer(0)
 {
     KGlobal::locale()->insertCatalog("libplasma");
@@ -246,16 +247,16 @@
     Plasma::Theme::defaultTheme()->setFont(cg.readEntry("desktopFont", font()));
 
     m_mainView = new NetView(0, NetView::mainViewId(), 0);
+
+    m_raiseTimer->setSingleShot(true);
+    connect(m_raiseTimer, SIGNAL(timeout()), this, SLOT(raiseMainView()));
+	
     connect(m_mainView, SIGNAL(containmentActivated()), this, \
                SLOT(mainContainmentActivated()));
     connect(KWindowSystem::self(), SIGNAL(workAreaChanged()), this, \
SLOT(positionPanel()));  m_mainView->installEventFilter(this);
 
     connect(KWindowSystem::self(), SIGNAL(activeWindowChanged(WId)), this, \
SLOT(controlBarVisibilityUpdate()));  
-    m_raiseTimer = new QTimer(this);
-    m_raiseTimer->setSingleShot(true);
-    connect(m_raiseTimer, SIGNAL(timeout()), this, SLOT(raiseMainView()));
-
     int width = 400;
     int height = 200;
     if (isDesktop) {


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