summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-11-09 10:32:16 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-11-09 10:32:16 +0000
commitbaffa2c7725560c09960951842eb95ff388c6575 (patch)
tree1ccde944ae37b7fd6c665e15add4b00788ebd5d8 /kde-base/libkworkspace
parentDrop unneeded patch (diff)
downloadhistorical-baffa2c7725560c09960951842eb95ff388c6575.tar.gz
historical-baffa2c7725560c09960951842eb95ff388c6575.tar.bz2
historical-baffa2c7725560c09960951842eb95ff388c6575.zip
Drop unneeded patch
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base/libkworkspace')
-rw-r--r--kde-base/libkworkspace/ChangeLog6
-rw-r--r--kde-base/libkworkspace/files/4.2-fix_logoff.patch13
2 files changed, 5 insertions, 14 deletions
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index c8cfbcc60307..f516f0c62b6e 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/libkworkspace
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.45 2009/11/09 00:13:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.46 2009/11/09 10:30:56 abcd Exp $
+
+ 09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+ -files/4.2-fix_logoff.patch:
+ Drop unneeded patch
08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org>
-libkworkspace-4.3.2.ebuild:
diff --git a/kde-base/libkworkspace/files/4.2-fix_logoff.patch b/kde-base/libkworkspace/files/4.2-fix_logoff.patch
deleted file mode 100644
index 1d71da79b573..000000000000
--- a/kde-base/libkworkspace/files/4.2-fix_logoff.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp
-===================================================================
---- trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp (revision 911248)
-+++ trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp (revision 911249)
-@@ -201,7 +201,7 @@
- KWorkSpace::ShutdownMode shutdownMode, /* NOT Default */
- const QString &bootOption )
- {
-- if (shutdownType == KWorkSpace::ShutdownTypeNone)
-+ if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
- return;
-
- bool cap_ask;