diff options
| author | Treeve Jelbert | 2010-03-05 10:34:24 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2010-03-05 10:34:24 +0100 |
| commit | 4d0be269dd7553de672f1f9132c06dc376be1675 (patch) | |
| tree | 8631b35ef9c93a2a4603a7077d52bb6875213536 | |
| parent | d3d2a3a40172abce45d2d05e50d0f9cb136ea4e8 (diff) | |
kdebase-workspace4 - remove previous patch
| -rw-r--r-- | kde4/kdebase-workspace4/HISTORY | 2 | ||||
| -rwxr-xr-x | kde4/kdebase-workspace4/PRE_BUILD | 4 | ||||
| -rw-r--r-- | kde4/kdebase-workspace4/lockdlg.diff | 51 |
3 files changed, 3 insertions, 54 deletions
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY index 4682aa020d..2a33cad21b 100644 --- a/kde4/kdebase-workspace4/HISTORY +++ b/kde4/kdebase-workspace4/HISTORY @@ -1,5 +1,7 @@ 2010-03-05 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.4.1 (stable) + * lockdlg.diff: deleted + * PRE_BUILD: don't apply patch 2010-02-18 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: SECURITY_PATCH=1 diff --git a/kde4/kdebase-workspace4/PRE_BUILD b/kde4/kdebase-workspace4/PRE_BUILD index 6f99fb9335..2a8ec76bc2 100755 --- a/kde4/kdebase-workspace4/PRE_BUILD +++ b/kde4/kdebase-workspace4/PRE_BUILD @@ -1,4 +1,2 @@ create_group kde4 && -default_pre_build && -cd $SOURCE_DIRECTORY && -patch -p5 < $SPELL_DIRECTORY/lockdlg.diff +default_pre_build diff --git a/kde4/kdebase-workspace4/lockdlg.diff b/kde4/kdebase-workspace4/lockdlg.diff deleted file mode 100644 index ad34cd7987..0000000000 --- a/kde4/kdebase-workspace4/lockdlg.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12 19:10:17 1089240 -+++ branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12 19:11:02 1089241 -@@ -85,7 +85,8 @@ - : KDialog(parent, Qt::X11BypassWindowManagerHint), - mPlugin( plugin ), - mCapsLocked(-1), -- mUnlockingFailed(false) -+ mUnlockingFailed(false), -+ sNot(0) - { - QWidget* w = mainWidget(); - -@@ -431,6 +432,8 @@ - // - void PasswordDlg::gplugStart() - { -+ if (sNot) -+ return; - int sfd[2]; - char fdbuf[16]; - -@@ -461,6 +464,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() -@@ -647,6 +651,11 @@ - KDisplayManager().switchVT( itm->vt ); - } - -+void PasswordDlg::slotNotifierDestroyed() -+{ -+ sNot = 0; -+} -+ - void PasswordDlg::capsLocked() - { - unsigned int lmask; ---- branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12 19:10:17 1089240 -+++ branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12 19:11:02 1089241 -@@ -63,6 +63,7 @@ - void slotOK(); - void slotActivity(); - void handleVerify(); -+ void slotNotifierDestroyed(); - - private: - void capsLocked(); |