--- kdeutils-3.5.4/klaptopdaemon/acpi_helper.cpp.acpi 2006-01-19 17:49:17.000000000 +0100
+++ kdeutils-3.5.4/klaptopdaemon/acpi_helper.cpp 2006-09-20 15:25:08.000000000 +0200
@@ -139,7 +139,7 @@
for (i = 1; i < argc; i++)
if (strcmp(argv[i], "--suspend") == 0 || strcmp(argv[i], "-suspend") == 0) {
/* Returns only if suspend does not exist. */
- run_program("/usr/sbin/suspend");
+ run_program("/usr/sbin/pm-suspend");
if (useSysPower)
write_to_power("mem");
else
@@ -158,7 +158,7 @@
exit(0);
} else
if (strcmp(argv[i], "--hibernate") == 0 || strcmp(argv[i], "-hibernate") == 0) {
- run_program("/usr/sbin/hibernate");
+ run_program("/usr/sbin/pm-hibernate");
if (useSysPower)
write_to_power("disk");
else
--- kdeutils-3.5.4/klaptopdaemon/portable.cpp.acpi 2006-09-21 19:15:49.000000000 +0200
+++ kdeutils-3.5.4/klaptopdaemon/portable.cpp 2006-09-21 19:44:28.000000000 +0200
@@ -1354,6 +1354,7 @@
if (known[type] == last_seed)
return(known_res[type]);
known[type] = last_seed;
+#if 0
known_res[type] = 0;
struct stat sb;
QString str = KStandardDirs::findExe("klaptop_acpi_helper");
@@ -1368,6 +1369,7 @@
return(0);
if (!(sb.st_mode&0x111))
return(0);
+#endif
known_res[type] = 1;
return(1);
}
--- kdeutils-3.5.4/klaptopdaemon/acpi.cpp.acpi 2006-09-21 18:53:50.000000000 +0200
+++ kdeutils-3.5.4/klaptopdaemon/acpi.cpp 2006-09-21 19:55:35.000000000 +0200
@@ -126,6 +126,7 @@
enableThrottle->setEnabled(can_enable);
connect( enableThrottle, SIGNAL(clicked()), this, SLOT(configChanged()) );
+#if 0
tmp_label = new QLabel(i18n("If the above boxes are disabled then there is no 'helper' "
"application set up to help change ACPI states, there are two "
"ways you can enable this application, either make the file "
@@ -142,7 +143,7 @@
ll->addWidget(setupButton);
ll->addStretch(8);
top_layout->addLayout(ll);
-
+#endif
top_layout->addStretch(1);
top_layout->addWidget( new QLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, Qt::AlignRight );
@@ -162,6 +163,7 @@
void AcpiConfig::setupHelper()
{
+#if 0
unsigned long len, crc;
QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
checkcrc(QFile::encodeName(helper), len, crc);
@@ -193,6 +195,7 @@
KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly."),
i18n("KLaptopDaemon"));
}
+#endif
laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
bool can_enable = laptop_portable::has_acpi(1); // is helper ready
enableStandby->setEnabled(can_enable);