[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/ksysguard/ksysguardd/Linux
From:       John Tapsell <john.tapsell () kdemail ! net>
Date:       2008-07-31 22:27:32
Message-ID: 1217543252.774943.16036.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840354 by johnflux:

Remove xres support.  This wasn't used and is superceeded with talking directly to \
kwin (which is somewhat faster)


 M  +0 -7      CMakeLists.txt  
 M  +0 -33     ProcessList.c  
 M  +0 -7      ProcessList.h  
 D             xres.c  


--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Linux/CMakeLists.txt \
#840353:840354 @@ -17,10 +17,6 @@
             softraid.c
             uptime.c)
 
-if(XRES_LIBRARY)
-  SET(LIBKSYSGUARDD_FILES ${LIBKSYSGUARDD_FILES} xres.c)
-endif(XRES_LIBRARY)
-
 if(SENSORS_FOUND)
   SET(LIBKSYSGUARDD_FILES ${LIBKSYSGUARDD_FILES} lmsensors.c)
 endif(SENSORS_FOUND)
@@ -32,9 +28,6 @@
 
 KDE4_ADD_LIBRARY(libksysguardd STATIC 
             ${LIBKSYSGUARDD_FILES})
-if(XRES_LIBRARY)
-  TARGET_LINK_LIBRARIES(libksysguardd ${XRES_LIBRARY})
-endif(XRES_LIBRARY)
 if(SENSORS_FOUND)
   TARGET_LINK_LIBRARIES(libksysguardd ${SENSORS_LIBRARIES})
 endif(SENSORS_FOUND)
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Linux/ProcessList.c \
#840353:840354 @@ -103,13 +103,6 @@
 #define true 1
 #define false 0
 #endif
-#include "config-ksysguardd.h" /*For HAVE_XRES*/
-#ifdef HAVE_XRES
-extern int setup_xres();
-extern void xrestop_populate_client_data();
-extern void printXres(FILE *CurrentClient);
-static int have_xres = 0;
-#endif
 
 typedef struct {
 
@@ -442,13 +435,6 @@
 #endif
   }
 
-#ifdef HAVE_XRES
-  have_xres = setup_xres();
-  if(have_xres) {
-    registerLegacyMonitor( "xres", "table", printXresList, printXresListInfo, sm);
-  }
-#endif
-
   /*open /proc now in advance*/
   /* read in current process list via the /proc file system entry */
   if ( ( procDir = opendir( "/proc" ) ) == NULL ) {
@@ -464,10 +450,6 @@
   removeMonitor( "ps" );
   removeMonitor( "pscount" );
 
-#ifdef HAVE_XRES
-  if(have_xres) 
-    removeMonitor( "xres" );
-#endif
   if ( !RunAsDaemon ) {
     removeCommand( "kill" );
     removeCommand( "setpriority" );
@@ -475,22 +457,7 @@
 
   exitPWUIDCache();
 }
-#ifdef HAVE_XRES
-void printXresListInfo( const char *cmd)
-{
-  (void)cmd;
-  fprintf(CurrentClient, "XPid\tXIdentifier\tXPxmMem\tXNumPxm\tXMemOther\n");
-  fprintf(CurrentClient, "d\ts\tD\td\tD\n");
-}
 
-void printXresList(const char*cmd)
-{
-  (void)cmd;
-  printXres(CurrentClient);
-}
-
-#endif
-
 void printProcessListInfo( const char* cmd )
 {
   (void)cmd;
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Linux/ProcessList.h \
#840353:840354 @@ -22,8 +22,6 @@
 #ifndef KSG_PROCESSLIST_H
 #define KSG_PROCESSLIST_H
 
-#include "config-ksysguardd.h" /*For HAVE_XRES*/
-
 void initProcessList( struct SensorModul* );
 void exitProcessList( void );
 
@@ -32,11 +30,6 @@
 void printProcessCount( const char* );
 void printProcessCountInfo( const char* );
 
-#ifdef HAVE_XRES
-void printXresListInfo( const char *);
-void printXresList( const char *);
-#endif
-
 void killProcess( const char* );
 void setPriority( const char* );
 void ioniceProcess( const char* );


[prev in list] [next in list] [prev in thread] [next in thread]