M +9 -7 daemon/actions/bundled/handlebuttoneventsconfig.cpp
M +2 -1 daemon/actions/bundled/suspendsession.h
M +1 -1 daemon/powerdevilaction.cpp
M +1 -1 kcmodule/global/GeneralPage.cpp
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/actions
SVN commit 1217284 by wstephens:
Remove MALLOC_CHECK_ from 4.6 branch
CCMAIL: release-team@kde.org
CCMAIL: kde-packa...@kde.org
M +0 -12 startkde.cmake
--- branches/KDE/4.6/kdebase/workspace/startkde.cmake #1217283:1217284
@@ -36,18 +36,6 @@
# we have to unset this for Darwin since
+9 -7 daemon/actions/bundled/handlebuttoneventsconfig.cpp
M +2 -1 daemon/actions/bundled/suspendsession.h
M +1 -1 daemon/powerdevilaction.cpp
M +1 -1 kcmodule/global/GeneralPage.cpp
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/actions/bundled/handl
for downstream dupes from the RCs?
M +27 -14powerdevilprofilegenerator.cpp
M +23 -0 powerdevilprofilegenerator.h
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/powerdevilprofilegene
rator.cpp #1216708:1216709 @@ -260,26 +260,18
On Tuesday 25 January 2011 12:52:14 Will Stephenson wrote:
On Monday 24 January 2011 11:19:16 Dario Freddi wrote:
SVN commit 1216709 by dafre:
CCMAIL: Dirk Mueller muel...@kde.org
CCMAIL: release-team@kde.org
Backporting r1216706
This commit fixes a critical bug in the
On Tuesday 25 January 2011 12:51:52 Will Stephenson wrote:
n Monday 24 January 2011 11:17:17 Dario Freddi wrote:
SVN commit 1216708 by dafre:
CCMAIL: Dirk Mueller muel...@kde.org
CCMAIL: release-team@kde.org
Backporting r1216705
This commit is critical and needs to be
nothing
-break;
+triggerAction(SuspendSession, args[Button]);
}
}
-}
bool HandleButtonEvents::loadAction(const KConfigGroup config)
{
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/actions/bundled/handlebuttoneventsconfig.cpp
#1216707:1216708
powerdevilprofilegenerator.h
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/powerdevilprofilegenerator.cpp
#1216708:1216709
@@ -260,26 +260,18 @@
runScript.writeEntry uint (scriptPhase, 0);
}
// SuspendSession
-if (oldGroup.readEntry int (idleAction, 0) 0
