summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--Makefile.am.in2
-rw-r--r--README2
-rw-r--r--tdecore/kcrash.cpp4
-rw-r--r--tdecore/tdestartupinfo.cpp2
-rw-r--r--tdeinit/CMakeLists.txt (renamed from kinit/CMakeLists.txt)2
-rw-r--r--tdeinit/LICENSE.setproctitle (renamed from kinit/LICENSE.setproctitle)0
-rw-r--r--tdeinit/Mainpage.dox (renamed from kinit/Mainpage.dox)0
-rw-r--r--tdeinit/Makefile.am (renamed from kinit/Makefile.am)2
-rw-r--r--tdeinit/README (renamed from kinit/README)0
-rw-r--r--tdeinit/README.DCOP (renamed from kinit/README.DCOP)0
-rw-r--r--tdeinit/README.autostart (renamed from kinit/README.autostart)0
-rw-r--r--tdeinit/README.wrapper (renamed from kinit/README.wrapper)0
-rw-r--r--tdeinit/autostart.cpp (renamed from kinit/autostart.cpp)0
-rw-r--r--tdeinit/autostart.h (renamed from kinit/autostart.h)0
-rw-r--r--tdeinit/configure.in.in (renamed from kinit/configure.in.in)0
-rw-r--r--tdeinit/kwrapper.c (renamed from kinit/kwrapper.c)0
-rw-r--r--tdeinit/lnusertemp.c (renamed from kinit/lnusertemp.c)0
-rw-r--r--tdeinit/setproctitle.cpp (renamed from kinit/setproctitle.cpp)0
-rw-r--r--tdeinit/setproctitle.h (renamed from kinit/setproctitle.h)0
-rw-r--r--tdeinit/shell.c (renamed from kinit/shell.c)0
-rw-r--r--tdeinit/start_tdeinit.c (renamed from kinit/start_tdeinit.c)0
-rw-r--r--tdeinit/start_tdeinit_wrapper.c (renamed from kinit/start_tdeinit_wrapper.c)0
-rw-r--r--tdeinit/tdedostartupconfig.cpp (renamed from kinit/tdedostartupconfig.cpp)0
-rw-r--r--tdeinit/tdeinit.cpp (renamed from kinit/kinit.cpp)2
-rw-r--r--tdeinit/tdeioslave.cpp (renamed from kinit/tdeioslave.cpp)0
-rw-r--r--tdeinit/tdelauncher.cpp (renamed from kinit/tdelauncher.cpp)0
-rw-r--r--tdeinit/tdelauncher.h (renamed from kinit/tdelauncher.h)0
-rw-r--r--tdeinit/tdelauncher_cmds.h (renamed from kinit/tdelauncher_cmds.h)0
-rw-r--r--tdeinit/tdelauncher_main.cpp (renamed from kinit/tdelauncher_main.cpp)0
-rw-r--r--tdeinit/tdestartupconfig.cpp (renamed from kinit/tdestartupconfig.cpp)0
-rw-r--r--tdeinit/tests/Makefile.am (renamed from kinit/tests/Makefile.am)0
-rw-r--r--tdeinit/tests/tdelaunchertest.cpp (renamed from kinit/tests/tdelaunchertest.cpp)0
-rw-r--r--tdeinit/wrapper.c (renamed from kinit/wrapper.c)0
34 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 499b18cc7..b9d179433 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -972,7 +972,7 @@ add_subdirectory( tdeparts )
add_subdirectory( tdeutils )
add_subdirectory( tdespell2 )
add_subdirectory( tdemdi )
-add_subdirectory( kinit )
+add_subdirectory( tdeinit )
add_subdirectory( tdeprint )
add_subdirectory( kab )
add_subdirectory( tderesources )
diff --git a/Makefile.am.in b/Makefile.am.in
index 2ebb4f8c6..30da00c6e 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -20,7 +20,7 @@
COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
COMPILE_BEFORE_doc = kdoctools
-COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
+COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint tdeinit kate interfaces tdecert tdehtml tderandr
COMPILE_AFTER_tdeprint = kate tdehtml
COMPILE_BEFORE_tdehtml = tdeutils
COMPILE_BEFORE_kabc = kab tderesources
diff --git a/README b/README
index c96978eb9..c16ab7334 100644
--- a/README
+++ b/README
@@ -81,7 +81,7 @@ Here is an alphabetical list:
An all purpose extension to the qimgio class that supports various
image formats.
-* kinit
+* tdeinit
Process launcher, used for fast KDE startup
* kio
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 08abe75c7..6fb5e8ff7 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -51,7 +51,7 @@
#include <tdeapplication.h>
#include <dcopclient.h>
-#include <../kinit/tdelauncher_cmds.h>
+#include <../tdeinit/tdelauncher_cmds.h>
#if defined Q_WS_X11
#include <X11/Xlib.h>
@@ -337,7 +337,7 @@ void TDECrash::startDirectly( const char* argv[], int )
}
}
-// From now on this code is copy&pasted from kinit/wrapper.c :
+// From now on this code is copy&pasted from tdeinit/wrapper.c :
extern char **environ;
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 3d798cdc1..731dc8b33 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -65,7 +65,7 @@ DEALINGS IN THE SOFTWARE.
static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO";
static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID";
-// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c ,
+// DESKTOP_STARTUP_ID is used also in tdeinit/wrapper.c ,
// tdesu in both tdelibs and tdebase and who knows where else
static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID";
diff --git a/kinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
index 88be32621..be78311eb 100644
--- a/kinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -34,7 +34,7 @@ link_directories(
set( target tdeinit )
set( ${target}_SRCS
- kinit.cpp setproctitle.cpp
+ tdeinit.cpp setproctitle.cpp
)
tde_add_executable( ${target}
diff --git a/kinit/LICENSE.setproctitle b/tdeinit/LICENSE.setproctitle
index d0ff63a9c..d0ff63a9c 100644
--- a/kinit/LICENSE.setproctitle
+++ b/tdeinit/LICENSE.setproctitle
diff --git a/kinit/Mainpage.dox b/tdeinit/Mainpage.dox
index 06a34909b..06a34909b 100644
--- a/kinit/Mainpage.dox
+++ b/tdeinit/Mainpage.dox
diff --git a/kinit/Makefile.am b/tdeinit/Makefile.am
index 3090d041e..85381ccd4 100644
--- a/kinit/Makefile.am
+++ b/tdeinit/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapp
lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = tdelauncher.la
-tdeinit_SOURCES = kinit.cpp setproctitle.cpp
+tdeinit_SOURCES = tdeinit.cpp setproctitle.cpp
# NOTE: We link against all common libraries even if we don't need them ourselves.
# For the future: examine if condensing the tons of *_LDFLAGS variables
diff --git a/kinit/README b/tdeinit/README
index 644efbaf6..644efbaf6 100644
--- a/kinit/README
+++ b/tdeinit/README
diff --git a/kinit/README.DCOP b/tdeinit/README.DCOP
index cd5ba983e..cd5ba983e 100644
--- a/kinit/README.DCOP
+++ b/tdeinit/README.DCOP
diff --git a/kinit/README.autostart b/tdeinit/README.autostart
index ab8132915..ab8132915 100644
--- a/kinit/README.autostart
+++ b/tdeinit/README.autostart
diff --git a/kinit/README.wrapper b/tdeinit/README.wrapper
index 11483d2bc..11483d2bc 100644
--- a/kinit/README.wrapper
+++ b/tdeinit/README.wrapper
diff --git a/kinit/autostart.cpp b/tdeinit/autostart.cpp
index 3f49dfc1d..3f49dfc1d 100644
--- a/kinit/autostart.cpp
+++ b/tdeinit/autostart.cpp
diff --git a/kinit/autostart.h b/tdeinit/autostart.h
index ce2efe2da..ce2efe2da 100644
--- a/kinit/autostart.h
+++ b/tdeinit/autostart.h
diff --git a/kinit/configure.in.in b/tdeinit/configure.in.in
index 1d14ee592..1d14ee592 100644
--- a/kinit/configure.in.in
+++ b/tdeinit/configure.in.in
diff --git a/kinit/kwrapper.c b/tdeinit/kwrapper.c
index 68f27a57a..68f27a57a 100644
--- a/kinit/kwrapper.c
+++ b/tdeinit/kwrapper.c
diff --git a/kinit/lnusertemp.c b/tdeinit/lnusertemp.c
index 171107041..171107041 100644
--- a/kinit/lnusertemp.c
+++ b/tdeinit/lnusertemp.c
diff --git a/kinit/setproctitle.cpp b/tdeinit/setproctitle.cpp
index e6c85561c..e6c85561c 100644
--- a/kinit/setproctitle.cpp
+++ b/tdeinit/setproctitle.cpp
diff --git a/kinit/setproctitle.h b/tdeinit/setproctitle.h
index 7a134e73e..7a134e73e 100644
--- a/kinit/setproctitle.h
+++ b/tdeinit/setproctitle.h
diff --git a/kinit/shell.c b/tdeinit/shell.c
index 62bcb3cc7..62bcb3cc7 100644
--- a/kinit/shell.c
+++ b/tdeinit/shell.c
diff --git a/kinit/start_tdeinit.c b/tdeinit/start_tdeinit.c
index e46aaa49f..e46aaa49f 100644
--- a/kinit/start_tdeinit.c
+++ b/tdeinit/start_tdeinit.c
diff --git a/kinit/start_tdeinit_wrapper.c b/tdeinit/start_tdeinit_wrapper.c
index 0328f3e43..0328f3e43 100644
--- a/kinit/start_tdeinit_wrapper.c
+++ b/tdeinit/start_tdeinit_wrapper.c
diff --git a/kinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp
index bbfdf88a4..bbfdf88a4 100644
--- a/kinit/tdedostartupconfig.cpp
+++ b/tdeinit/tdedostartupconfig.cpp
diff --git a/kinit/kinit.cpp b/tdeinit/tdeinit.cpp
index b635b63e6..ca0d1dcaf 100644
--- a/kinit/kinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -168,7 +168,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
/* These are to link libtdeparts even if 'smart' linker is used */
#include <tdeparts/plugin.h>
-extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
+extern "C" KParts::Plugin* _tdeinit_init_tdeparts() { return new KParts::Plugin(); }
/* These are to link libtdeio even if 'smart' linker is used */
#include <tdeio/authinfo.h>
extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
diff --git a/kinit/tdeioslave.cpp b/tdeinit/tdeioslave.cpp
index 1690ca2f7..1690ca2f7 100644
--- a/kinit/tdeioslave.cpp
+++ b/tdeinit/tdeioslave.cpp
diff --git a/kinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index f7ca08678..f7ca08678 100644
--- a/kinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
diff --git a/kinit/tdelauncher.h b/tdeinit/tdelauncher.h
index 791958980..791958980 100644
--- a/kinit/tdelauncher.h
+++ b/tdeinit/tdelauncher.h
diff --git a/kinit/tdelauncher_cmds.h b/tdeinit/tdelauncher_cmds.h
index 5763e5a38..5763e5a38 100644
--- a/kinit/tdelauncher_cmds.h
+++ b/tdeinit/tdelauncher_cmds.h
diff --git a/kinit/tdelauncher_main.cpp b/tdeinit/tdelauncher_main.cpp
index 747050668..747050668 100644
--- a/kinit/tdelauncher_main.cpp
+++ b/tdeinit/tdelauncher_main.cpp
diff --git a/kinit/tdestartupconfig.cpp b/tdeinit/tdestartupconfig.cpp
index 373ac6787..373ac6787 100644
--- a/kinit/tdestartupconfig.cpp
+++ b/tdeinit/tdestartupconfig.cpp
diff --git a/kinit/tests/Makefile.am b/tdeinit/tests/Makefile.am
index e1157bf72..e1157bf72 100644
--- a/kinit/tests/Makefile.am
+++ b/tdeinit/tests/Makefile.am
diff --git a/kinit/tests/tdelaunchertest.cpp b/tdeinit/tests/tdelaunchertest.cpp
index 07eaf21f7..07eaf21f7 100644
--- a/kinit/tests/tdelaunchertest.cpp
+++ b/tdeinit/tests/tdelaunchertest.cpp
diff --git a/kinit/wrapper.c b/tdeinit/wrapper.c
index d22ba5080..d22ba5080 100644
--- a/kinit/wrapper.c
+++ b/tdeinit/wrapper.c