diff options
Diffstat (limited to 'kmilo/delli8k')
| -rw-r--r-- | kmilo/delli8k/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kmilo/delli8k/delli8k.cpp | 5 | ||||
| -rw-r--r-- | kmilo/delli8k/i8k.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/kmilo/delli8k/CMakeLists.txt b/kmilo/delli8k/CMakeLists.txt index e8655e7..29cd516 100644 --- a/kmilo/delli8k/CMakeLists.txt +++ b/kmilo/delli8k/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kmilo_delli8k AUTOMOC tde_create_translated_desktop( SOURCE kmilo_delli8k.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp index d63c8c7..2bcb9ed 100644 --- a/kmilo/delli8k/delli8k.cpp +++ b/kmilo/delli8k/delli8k.cpp @@ -31,6 +31,7 @@ #include "kmilointerface.h" #include <fcntl.h> +#include <unistd.h> #include <sys/ioctl.h> #include "i8k.h" @@ -144,7 +145,7 @@ bool DellI8kMonitor::retrieveVolume() if (kmix_error) { // maybe the error occurred because kmix wasn't running - if( kapp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix + if( tdeApp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix { // trying again reply = kmixClient->call( "masterVolume"); @@ -209,7 +210,7 @@ bool DellI8kMonitor::retrieveMute() if (kmix_error) { // maybe the error occurred because kmix wasn't running - if( kapp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix + if( tdeApp->startServiceByDesktopName( "kmix" ) == 0 ) // trying to start kmix { // trying again reply = kmixClient->call( "masterVolume" ); diff --git a/kmilo/delli8k/i8k.h b/kmilo/delli8k/i8k.h index 1c45ba5..a8b16fd 100644 --- a/kmilo/delli8k/i8k.h +++ b/kmilo/delli8k/i8k.h @@ -20,6 +20,10 @@ #define I8K_PROC "/proc/i8k" #define I8K_PROC_FMT "1.0" +#ifdef Q_OS_SOLARIS +#include <sys/ioccom.h> +#endif + #define I8K_BIOS_VERSION _IOR ('i', 0x80, int) /* broken: meant 4 bytes */ #define I8K_MACHINE_ID _IOR ('i', 0x81, int) /* broken: meant 16 bytes */ #define I8K_POWER_STATUS _IOR ('i', 0x82, size_t) |