diff options
author | Gregorio Guidi <greg_g@gentoo.org> | 2005-10-19 14:34:28 +0000 |
---|---|---|
committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-10-19 14:34:28 +0000 |
commit | edc7a904f13466ed1063774d5d47c8a9d60697e2 (patch) | |
tree | 6921e93725830099893a1c935dd942a230e22fa1 /kde-base/kdeutils/files | |
parent | Marking c-ares-1.2.1-r1 ~ppc64 (diff) | |
download | gentoo-2-edc7a904f13466ed1063774d5d47c8a9d60697e2.tar.gz gentoo-2-edc7a904f13466ed1063774d5d47c8a9d60697e2.tar.bz2 gentoo-2-edc7a904f13466ed1063774d5d47c8a9d60697e2.zip |
Add patch to fix error messages in klaptopdaemon (#109421).
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'kde-base/kdeutils/files')
-rw-r--r-- | kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1 | 1 | ||||
-rw-r--r-- | kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1 b/kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1 new file mode 100644 index 000000000000..0b8cb3d8d2fe --- /dev/null +++ b/kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1 @@ -0,0 +1 @@ +MD5 d467284b523bb1268da776cd016ede4d kdeutils-3.4.3.tar.bz2 2257060 diff --git a/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch b/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch new file mode 100644 index 000000000000..28344217e647 --- /dev/null +++ b/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch @@ -0,0 +1,49 @@ +diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp +--- kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp 2005-10-05 15:26:42.000000000 +0200 ++++ kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp 2005-10-18 15:38:21.000000000 +0200 +@@ -919,7 +919,7 @@ + // the lid button turns stuff on when it's down and back off again when it's raised + // (kind of like the fridge door light) + // +- if (lid_state != laptop_portable::get_button(laptop_portable::LidButton)) { ++ if (s.enable_lid_button && (lid_state != laptop_portable::get_button(laptop_portable::LidButton))) { + lid_state = !lid_state; + if (lid_state) { + if (s.button_lid_bright_enabled) { +@@ -982,7 +982,7 @@ + // + // the power button on the other hand is an off/on switch for non-suspend type ops + // +- if (power_state != laptop_portable::get_button(laptop_portable::PowerButton)) { ++ if (s.enable_power_button && (power_state != laptop_portable::get_button(laptop_portable::PowerButton))) { + power_state = !power_state; + if (power_state) { + if (power_button_off) { +diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp kdeutils-3.4.3/klaptopdaemon/portable.cpp +--- kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp 2005-10-05 15:26:42.000000000 +0200 ++++ kdeutils-3.4.3/klaptopdaemon/portable.cpp 2005-10-18 15:38:21.000000000 +0200 +@@ -1937,19 +1937,19 @@ + laptop_portable::get_button(LaptopButton l) // true if a button is pressed + { + if (::has_acpi()) { +- QString *name=0; ++ QString name; + switch (l) { + case LidButton: +- name = &acpi_lid_name; ++ name = acpi_lid_name; + break; + case PowerButton: +- name = &acpi_power_name; ++ name = acpi_power_name; + break; + default: + break; + } +- if (name) { +- QFile f(*name); ++ if (!name.isNull()) { ++ QFile f(name); + if (f.open(IO_ReadOnly)) { + while (!f.atEnd()) { + QString l; |