diff options
| -rw-r--r-- | kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch | 25 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch new file mode 100644 index 00000000000..d14715684de --- /dev/null +++ b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch @@ -0,0 +1,25 @@ +--- a/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/02/24 04:51:03 930724 ++++ b/kdebase/workspace/plasma/shells/desktop/panelview.cpp 2009/03/03 23:39:55 934863 +@@ -203,6 +203,11 @@ + m_triggerEntered(false) + { + Q_ASSERT(qobject_cast<Plasma::Corona*>(panel->scene())); ++ ++ m_strutsTimer = new QTimer(this); ++ m_strutsTimer->setSingleShot(true); ++ connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts())); ++ + if (panel) { + connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted())); + connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController())); +@@ -248,10 +253,6 @@ + KWindowSystem::setOnAllDesktops(winId(), true); + + QTimer::singleShot(0, this, SLOT(init())); +- +- m_strutsTimer = new QTimer(this); +- m_strutsTimer->setSingleShot(true); +- connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts())); + } + + PanelView::~PanelView() diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild index 2cc52db4563..fddf6fcc90f 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild @@ -58,6 +58,8 @@ KMEXTRACTONLY=" KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager" +PATCHES=( "${FILESDIR}/4.2.1-panelview-crash-fix.patch" ) + src_configure() { mycmakeargs="${mycmakeargs} $(cmake-utils_use_with google-gadgets Googlegadgets) |