Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: 4.2.1-panelview-crash-fix.patch
Date: Sun, 08 Mar 2009 19:37:50
Message-Id: E1LgOom-0003aZ-Jr@stork.gentoo.org
1 scarabeus 09/03/08 19:37:48
2
3 Added: 4.2.1-panelview-crash-fix.patch
4 Log:
5 Add panelview crash fix per bug #261460.
6 (Portage version: 2.2_rc23/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch?rev=1.1&content-type=text/plain
13
14 Index: 4.2.1-panelview-crash-fix.patch
15 ===================================================================
16 --- a/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/02/24 04:51:03 930724
17 +++ b/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/03/03 23:39:55 934863
18 @@ -203,6 +203,11 @@
19 m_triggerEntered(false)
20 {
21 Q_ASSERT(qobject_cast<Plasma::Corona*>(panel->scene()));
22 +
23 + m_strutsTimer = new QTimer(this);
24 + m_strutsTimer->setSingleShot(true);
25 + connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
26 +
27 if (panel) {
28 connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
29 connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
30 @@ -248,10 +253,6 @@
31 KWindowSystem::setOnAllDesktops(winId(), true);
32
33 QTimer::singleShot(0, this, SLOT(init()));
34 -
35 - m_strutsTimer = new QTimer(this);
36 - m_strutsTimer->setSingleShot(true);
37 - connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts()));
38 }
39
40 PanelView::~PanelView()