diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-10 13:17:26 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-10 13:17:26 +0000 |
commit | b28ff36ed60d4870936cbcc93cd5f393206196fd (patch) | |
tree | 4a9eba5cf7ad33f7f6429d594133aba6149f4ea7 /kde-base/krunner | |
parent | Drop unused patch. (diff) | |
download | gentoo-2-b28ff36ed60d4870936cbcc93cd5f393206196fd.tar.gz gentoo-2-b28ff36ed60d4870936cbcc93cd5f393206196fd.tar.bz2 gentoo-2-b28ff36ed60d4870936cbcc93cd5f393206196fd.zip |
Drop unused patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/krunner')
-rw-r--r-- | kde-base/krunner/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch | 51 |
2 files changed, 5 insertions, 52 deletions
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog index 64539309aa82..ac2d0727429a 100644 --- a/kde-base/krunner/ChangeLog +++ b/kde-base/krunner/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/krunner # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.75 2010/08/09 17:34:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.76 2010/08/10 13:17:26 scarabeus Exp $ + + 10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -files/krunner-4.4.0_lock_dialog_crash.patch: + Drop unused patch. 09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> krunner-4.4.5.ebuild: Drop alpha ia64 and sparc per the AT Lead permission. diff --git a/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch b/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch deleted file mode 100644 index 27c46b007f5d..000000000000 --- a/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12 17:50:14 1089212 -+++ trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12 17:51:21 1089213 -@@ -85,7 +85,8 @@ - : KDialog(parent, Qt::X11BypassWindowManagerHint), - mPlugin( plugin ), - mCapsLocked(-1), -- mUnlockingFailed(false) -+ mUnlockingFailed(false), -+ sNot(0) - { - QWidget* w = mainWidget(); - -@@ -435,6 +436,8 @@ - // - void PasswordDlg::gplugStart() - { -+ if (sNot) -+ return; - int sfd[2]; - char fdbuf[16]; - -@@ -465,6 +468,7 @@ - sFd = sfd[0]; - sNot = new QSocketNotifier(sFd, QSocketNotifier::Read, this); - connect(sNot, SIGNAL(activated(int)), SLOT(handleVerify())); -+ connect(sNot, SIGNAL(destroyed()), SLOT(slotNotifierDestroyed())); - } - - void PasswordDlg::gplugChanged() -@@ -651,6 +655,11 @@ - KDisplayManager().switchVT( itm->vt ); - } - -+void PasswordDlg::slotNotifierDestroyed() -+{ -+ sNot = 0; -+} -+ - void PasswordDlg::capsLocked() - { - unsigned int lmask; ---- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12 17:50:14 1089212 -+++ trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12 17:51:21 1089213 -@@ -63,6 +63,7 @@ - void slotOK(); - void slotActivity(); - void handleVerify(); -+ void slotNotifierDestroyed(); - - private: - void capsLocked(); |