Hello community, here is the log from the commit of package kpowersave checked in at Tue Mar 13 00:54:14 CET 2007. -------- --- arch/i386/kpowersave/kpowersave.changes 2007-03-12 15:05:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/kpowersave/kpowersave.changes 2007-03-12 15:08:18.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 12 15:07:59 CET 2007 - schwab@suse.de + +- Restore fallback to userspace governor. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpowersave.spec ++++++ --- /var/tmp/diff_new_pack.vz6536/_old 2007-03-13 00:54:04.000000000 +0100 +++ /var/tmp/diff_new_pack.vz6536/_new 2007-03-13 00:54:04.000000000 +0100 @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Frontend for Battery Monitoring, Suspend, CPU Freq and General Power Management Support Version: 0.7.2 -Release: 5 +Release: 6 ExclusiveArch: %ix86 x86_64 ia64 ppc Requires: yast2-power-management /sbin/pidof xorg-x11 Source: %{name}-%{version}.tar.bz2 @@ -89,6 +89,8 @@ /opt/kde3/lib*/libkdeinit_kpowersave.* %changelog +* Mon Mar 12 2007 - schwab@suse.de +- Restore fallback to userspace governor. * Mon Mar 12 2007 - dkukawka@suse.de - removed part of the patch. See comments in bug #229234 * Sun Mar 11 2007 - schwab@suse.de ++++++ kpowersave-0.7.2.diff ++++++ --- /var/tmp/diff_new_pack.vz6536/_old 2007-03-13 00:54:04.000000000 +0100 +++ /var/tmp/diff_new_pack.vz6536/_new 2007-03-13 00:54:04.000000000 +0100 @@ -1,3 +1,67 @@ +--- src/hardware.cpp ++++ src/hardware.cpp +@@ -953,6 +953,7 @@ + } + + char *governor; ++ int reply; + int consider = getAcAdapter(); + + switch (cpufreq) { +@@ -960,6 +961,8 @@ + governor = "performance"; + if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, + HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", ++ &reply, ++ DBUS_TYPE_INVALID, + DBUS_TYPE_STRING, &governor, + DBUS_TYPE_INVALID)) { + myDebug("Could not set CPU Freq to performance policy"); +@@ -970,26 +973,29 @@ + governor = "ondemand"; + if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, + HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", ++ &reply, ++ DBUS_TYPE_INVALID, + DBUS_TYPE_STRING, &governor, +- DBUS_TYPE_INVALID) || +- (checkCurrentCPUFreqPolicy() != cpufreq)){ ++ DBUS_TYPE_INVALID)) { + myDebug("Couldn't set CPUFreq to ondemand, try now userspace"); + governor = "userspace"; + if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, + HAL_CPUFREQ_IFACE, + "SetCPUFreqGovernor", ++ &reply, ++ DBUS_TYPE_INVALID, + DBUS_TYPE_STRING, &governor, +- DBUS_TYPE_INVALID) || +- (checkCurrentCPUFreqPolicy() != cpufreq)) { ++ DBUS_TYPE_INVALID)) { + myDebug("Couldn't set CPUFreq to userspace, try conservative"); + governor = "conservative"; + if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, + HAL_COMPUTER_UDI, + HAL_CPUFREQ_IFACE, + "SetCPUFreqGovernor", ++ &reply, ++ DBUS_TYPE_INVALID, + DBUS_TYPE_STRING, &governor, +- DBUS_TYPE_INVALID) || +- (checkCurrentCPUFreqPolicy() != cpufreq)) { ++ DBUS_TYPE_INVALID)) { + myDebug("Couldn't set CPUFreq to DYNAMIC, not to " + "ondemand, userspace nor to conservative"); + return false; +@@ -1021,6 +1027,8 @@ + governor = "powersave"; + if (!dbus_HAL->dbusSystemMethodCall( HAL_SERVICE, HAL_COMPUTER_UDI, + HAL_CPUFREQ_IFACE, "SetCPUFreqGovernor", ++ &reply, ++ DBUS_TYPE_INVALID, + DBUS_TYPE_STRING, &governor, + DBUS_TYPE_INVALID)) { + myDebug("Could not set CPU Freq to performance policy"); --- src/kpowersave.cpp +++ src/kpowersave.cpp @@ -1603,7 +1603,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org