diff options
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ksmserver/Makefile.am | 4 | ||||
| -rw-r--r-- | ksmserver/README | 4 | ||||
| -rw-r--r-- | ksmserver/server.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index fa8677c03..0a0a4f5ca 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -36,12 +36,12 @@ install( FILES ksmserver.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES move_session_config.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -##### ksmserver (kdeinit) ####################### +##### ksmserver (tdeinit) ####################### -tde_add_kdeinit_executable( ksmserver AUTOMOC +tde_add_tdeinit_executable( ksmserver AUTOMOC SOURCES main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface.skel server.skel timed.ui - LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} + LINK dmctl-static tdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} ) diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index a06a82f93..68eb5f2a8 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -21,7 +21,7 @@ INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = ksmserver.la +tdeinit_LTLIBRARIES = ksmserver.la noinst_HEADERS = global.h server.h ksmserver_la_METASOURCES = AUTO @@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/kconf_update EXTRA_PROGRAMS = testsh testsh_SOURCES = test.cpp timed.ui -testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) messages: diff --git a/ksmserver/README b/ksmserver/README index 1c74111ae..759e57c9d 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -53,7 +53,7 @@ should be in startup.cpp and going down in that source file should follow the startup order (but note that this is just a documentation which may get outdated, so in case of doubts the source wins ;) ). -The startkde scripts already launches kdeinit, which in turns launches +The startkde scripts already launches tdeinit, which in turns launches KDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded kded modules, i.e. those that have X-KDE-Kded-autoload=true in .desktop files. The exact way autoloading works is controlled by X-KDE-Kded-phase=, @@ -69,7 +69,7 @@ modules. There are three kcminit phases, 0, 1 and 2, controlled by X-KDE-Init-Phase= in the .desktop file, which defaults to 1. Phase 0 kcminit modules should be only those that really need to be run early in the startup process (and those should probably actually use kstartupconfig in startkde -to be done even before kdeinit and daemons). After executing phase 0 +to be done even before tdeinit and daemons). After executing phase 0 modules kcminit returns and waits. When ksmserver is launched, the first thing it does is launching diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 191a5ff63..ac4ef0e28 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -109,7 +109,7 @@ void KSMServer::startApplication( TQStringList command, const TQString& clientMa command.prepend( "--" ); command.prepend( userId ); command.prepend( "-u" ); - command.prepend( "kdesu" ); + command.prepend( "tdesu" ); } } if ( !clientMachine.isEmpty() && clientMachine != "localhost" ) { @@ -650,7 +650,7 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) fprintf(f, "%s\n%i\n", session_manager, getpid()); fclose(f); setenv( "SESSION_MANAGER", session_manager, true ); - // Pass env. var to kdeinit. + // Pass env. var to tdeinit. DCOPRef( launcher ).send( "setLaunchEnv", "SESSION_MANAGER", (const char*) session_manager ); } |