diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2010-02-12 18:56:49 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2010-02-12 18:56:49 +0000 |
| commit | 83c21ef4afbf6a59dbf22319793d45fcdf7906d5 (patch) | |
| tree | e64695a3146739d3180dd3aae7b0e91283128619 /kde-base/krunner/files | |
| parent | Masked app-emulation/mol. (diff) | |
| download | historical-83c21ef4afbf6a59dbf22319793d45fcdf7906d5.tar.gz historical-83c21ef4afbf6a59dbf22319793d45fcdf7906d5.tar.bz2 historical-83c21ef4afbf6a59dbf22319793d45fcdf7906d5.zip | |
Copied Alex (wired) ebuild from the kde overlay.
Thanks to Jeff Mitchell (jefferai) for the patch.
[kde-base/krunner-4.4.0-r1] fixed lock dialog crash - b.k.o #217882
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'kde-base/krunner/files')
| -rw-r--r-- | kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch | 51 |
1 files changed, 51 insertions, 0 deletions
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 new file mode 100644 index 000000000000..27c46b007f5d --- /dev/null +++ b/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch @@ -0,0 +1,51 @@ +--- 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(); |