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

List:       kde-commits
Subject:    KDE/kdebase/workspace [POSSIBLY UNSAFE]
From:       David Faure <faure () kde ! org>
Date:       2007-10-15 21:52:12
Message-ID: 1192485132.781027.4830.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 725642 by dfaure:

kstartupconfig -> kstartupconfig4
kdostartupconfig -> kdostartupconfig4
These are internal tools but for speed reasons startkde looks for them in the PATH \
instead of in kde4/libexec.


 M  +6 -6      kstartupconfig/CMakeLists.txt  
 M  +4 -4      kstartupconfig/kstartupconfig.cpp   [POSSIBLY UNSAFE: system]
 M  +2 -2      startkde.cmake  


--- trunk/KDE/kdebase/workspace/kstartupconfig/CMakeLists.txt #725641:725642
@@ -2,19 +2,19 @@
 
 set(kstartupconfig_SRCS kstartupconfig.cpp )
 
-kde4_add_executable(kstartupconfig NOGUI ${kstartupconfig_SRCS})
+kde4_add_executable(kstartupconfig4 NOGUI ${kstartupconfig_SRCS})
 
-target_link_libraries(kstartupconfig kdefakes ${KDE4_KDECORE_LIBS})
+target_link_libraries(kstartupconfig4 kdefakes ${KDE4_KDECORE_LIBS})
 
-install(TARGETS kstartupconfig DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kstartupconfig4 DESTINATION ${BIN_INSTALL_DIR} )
 
 ########### kdostartupconfig ###############
 
 set(kdostartupconfig_SRCS kdostartupconfig.cpp )
 
-kde4_add_executable(kdostartupconfig NOGUI ${kdostartupconfig_SRCS})
+kde4_add_executable(kdostartupconfig4 NOGUI ${kdostartupconfig_SRCS})
 
-target_link_libraries(kdostartupconfig ${KDE4_KDECORE_LIBS} )
+target_link_libraries(kdostartupconfig4 ${KDE4_KDECORE_LIBS} )
 
-install(TARGETS kdostartupconfig DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kdostartupconfig4 DESTINATION ${BIN_INSTALL_DIR} )
 
--- trunk/KDE/kdebase/workspace/kstartupconfig/kstartupconfig.cpp #725641:725642
@@ -90,7 +90,7 @@
     strlcat( filename, "/share/config/startupconfig", 1024 );
     if( access( filename, R_OK ) != 0 )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "kdostartupconfig4" );
         return WEXITSTATUS( ret );
         }
     strlcpy( filename, kdehome, 1024 );
@@ -98,14 +98,14 @@
     struct stat st;
     if( stat( filename, &st ) != 0 )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "kdostartupconfig4" );
         return WEXITSTATUS( ret );
         }
     time_t config_time = st.st_mtime;
     FILE* config = fopen( filename, "r" );
     if( config == NULL )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "kdostartupconfig4" );
         return WEXITSTATUS( ret );
         }
     strlcpy( filename, kdehome, 1024 );
@@ -169,7 +169,7 @@
     fclose( config );
     if( need_update )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "kdostartupconfig4" );
         return WEXITSTATUS( ret );
         }
     return 0;
--- trunk/KDE/kdebase/workspace/startkde.cmake #725641:725642
@@ -74,9 +74,9 @@
 kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 EOF
-kstartupconfig
+kstartupconfig4
 if test $? -ne 0; then
-    xmessage -geometry 500x100 "Could not start kstartupconfig. Check your \
installation." +    xmessage -geometry 500x100 "Could not start kstartupconfig4. \
Check your installation."  fi
 . $kdehome/share/config/startupconfig
 


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