Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/powerdevil/files: powerdevil-4.6.2-global-key-shortcuts-fix.patch
Date: Wed, 27 Apr 2011 17:25:06
Message-Id: 20110427172135.C775E20054@flycatcher.gentoo.org
1 tampakrap 11/04/27 17:21:35
2
3 Added: powerdevil-4.6.2-global-key-shortcuts-fix.patch
4 Log:
5 Revision bump, apply upstream patch to fix global key shortcuts being reset to their default value at each login, bug 365039
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch?rev=1.1&content-type=text/plain
14
15 Index: powerdevil-4.6.2-global-key-shortcuts-fix.patch
16 ===================================================================
17 commit b6087c028016409c73e8b96c3600369edc89817b
18 Author: Björn Ruberg <bjoern@××××××××××××××.de>
19 Date: Wed Apr 27 07:14:24 2011 +0200
20
21 Fix global key shortcuts (powermanagement: suspend, hibernate, ...) being resetted to their default value at each login.
22 BUG: 262908
23
24 diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp
25 index 3d08b02..5f7fab5 100644
26 --- a/powerdevil/daemon/powerdevilcore.cpp
27 +++ b/powerdevil/daemon/powerdevilcore.cpp
28 @@ -151,37 +151,27 @@ void Core::onBackendReady()
29
30 KAction* globalAction = actionCollection->addAction("Increase Screen Brightness");
31 globalAction->setText(i18nc("Global shortcut", "Increase Screen Brightness"));
32 - globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp),
33 - KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
34 - KAction::NoAutoloading);
35 + globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp));
36 connect(globalAction, SIGNAL(triggered(bool)), SLOT(increaseBrightness()));
37
38 globalAction = actionCollection->addAction("Decrease Screen Brightness");
39 globalAction->setText(i18nc("Global shortcut", "Decrease Screen Brightness"));
40 - globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown),
41 - KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
42 - KAction::NoAutoloading);
43 + globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown));
44 connect(globalAction, SIGNAL(triggered(bool)), SLOT(decreaseBrightness()));
45
46 globalAction = actionCollection->addAction("Sleep");
47 globalAction->setText(i18nc("Global shortcut", "Sleep"));
48 - globalAction->setGlobalShortcut(KShortcut(Qt::Key_Sleep),
49 - KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
50 - KAction::NoAutoloading);
51 + globalAction->setGlobalShortcut(KShortcut(Qt::Key_Sleep));
52 connect(globalAction, SIGNAL(triggered(bool)), SLOT(suspendToRam()));
53
54 globalAction = actionCollection->addAction("Hibernate");
55 globalAction->setText(i18nc("Global shortcut", "Hibernate"));
56 - globalAction->setGlobalShortcut(KShortcut(Qt::Key_Hibernate),
57 - KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
58 - KAction::NoAutoloading);
59 + globalAction->setGlobalShortcut(KShortcut(Qt::Key_Hibernate));
60 connect(globalAction, SIGNAL(triggered(bool)), SLOT(suspendToDisk()));
61
62 globalAction = actionCollection->addAction("PowerOff");
63 //globalAction->setText(i18nc("Global shortcut", "Power Off button"));
64 - globalAction->setGlobalShortcut(KShortcut(Qt::Key_PowerOff),
65 - KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
66 - KAction::NoAutoloading);
67 + globalAction->setGlobalShortcut(KShortcut(Qt::Key_PowerOff));
68 connect(globalAction, SIGNAL(triggered(bool)), SLOT(powerOffButtonTriggered()));
69 }