summaryrefslogtreecommitdiffstats
path: root/ksysguard
diff options
context:
space:
mode:
Diffstat (limited to 'ksysguard')
-rw-r--r--ksysguard/gui/Makefile.am6
-rw-r--r--ksysguard/gui/ksgrd/Makefile.am2
-rw-r--r--ksysguard/ksysguardd/Irix/ProcessList.c2
-rw-r--r--ksysguard/ksysguardd/Linux/ProcessList.c14
4 files changed, 12 insertions, 12 deletions
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 0ccf4c055..4479b1c38 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -31,8 +31,8 @@ ksysguard_SOURCES = \
ksysguard_LDADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
- $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD)
-ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ $(LIB_TDEUI) $(LIB_KIO) $(LIB_KDNSSD)
+ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kpm_SOURCES = kpm.c
@@ -49,7 +49,7 @@ sysguard_panelapplet_la_SOURCES = \
sysguard_panelapplet_la_LIBADD = \
ksgrd/libksgrd.la \
SensorDisplayLib/libsensordisplays.la \
- $(LIB_KDEUI) $(LIB_KIO)
+ $(LIB_TDEUI) $(LIB_KIO)
sysguard_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
EXTRA_DIST = $(lnk_DATA)
diff --git a/ksysguard/gui/ksgrd/Makefile.am b/ksysguard/gui/ksgrd/Makefile.am
index ff5f0aa47..52f5bfd01 100644
--- a/ksysguard/gui/ksgrd/Makefile.am
+++ b/ksysguard/gui/ksgrd/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../SensorDisplayLib $(all_includes)
lib_LTLIBRARIES = libksgrd.la
libksgrd_la_LDFLAGS = -no-undefined -version-info 3:0:2 $(all_libraries)
-libksgrd_la_LIBADD = $(LIB_KDEUI)
+libksgrd_la_LIBADD = $(LIB_TDEUI)
# Which sources should be compiled for ksysguard.
libksgrd_la_SOURCES = \
diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c
index 3ef86684a..5bc2230b0 100644
--- a/ksysguard/ksysguardd/Irix/ProcessList.c
+++ b/ksysguard/ksysguardd/Irix/ProcessList.c
@@ -44,7 +44,7 @@
#include "ProcessList.h"
#define BUFSIZE 1024
-#define KDEINITLEN strlen("tdeinit: ")
+#define TDEINITLEN strlen("tdeinit: ")
typedef struct {
int alive; /* for "garbage collection" */
diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c
index 1eba1f6cc..2708664bd 100644
--- a/ksysguard/ksysguardd/Linux/ProcessList.c
+++ b/ksysguard/ksysguardd/Linux/ProcessList.c
@@ -40,7 +40,7 @@
#define BUFSIZE 1024
#define TAGSIZE 32
-#define KDEINITLEN strlen( "tdeinit: " )
+#define TDEINITLEN strlen( "tdeinit: " )
static CONTAINER ProcessList = 0;
@@ -289,18 +289,18 @@ static int updateProcess( int pid )
/* Ugly hack to "fix" program name for tdeinit launched programs. */
if ( strcmp( ps->name, "tdeinit" ) == 0 &&
- strncmp( ps->cmdline, "tdeinit: ", KDEINITLEN ) == 0 &&
- strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) {
+ strncmp( ps->cmdline, "tdeinit: ", TDEINITLEN ) == 0 &&
+ strcmp( ps->cmdline + TDEINITLEN, "Running..." ) != 0 ) {
size_t len;
- char* end = strchr( ps->cmdline + KDEINITLEN, ' ' );
+ char* end = strchr( ps->cmdline + TDEINITLEN, ' ' );
if ( end )
- len = ( end - ps->cmdline ) - KDEINITLEN;
+ len = ( end - ps->cmdline ) - TDEINITLEN;
else
- len = strlen( ps->cmdline + KDEINITLEN );
+ len = strlen( ps->cmdline + TDEINITLEN );
if ( len > 0 ) {
if ( len > sizeof( ps->name ) - 1 )
len = sizeof( ps->name ) - 1;
- strncpy( ps->name, ps->cmdline + KDEINITLEN, len );
+ strncpy( ps->name, ps->cmdline + TDEINITLEN, len );
ps->name[ len ] = '\0';
}
}