diff options
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/README | 12 | ||||
| -rw-r--r-- | ksmserver/startup.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ksmserver/README b/ksmserver/README index d6779c070..dc99a3f1c 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -24,13 +24,13 @@ Here's a short overview on how session management works. Starting the server ------------------- -The server is usually started from the 'startkde' script. It supports the following options: +The server is usually started from the 'starttde' script. It supports the following options: -r, --restore Restores the previous session if available -w, --windowmanager <wm> Starts 'wm' in case no other window manager is participating in the session. Default is 'twin' -The default 'startkde' launches 'ksmserver --restore'. The +The default 'starttde' launches 'ksmserver --restore'. The 'windowmanager' option is useful for users that prefer a window manager other than twin. Since the window manager has to participate in the session (it has to remember window positions and states), it is @@ -47,13 +47,13 @@ KDE startup sequence -------------------- Ksmserver controls the second part of the KDE startup sequence, -after it gets control from the startkde script, which controls +after it gets control from the starttde script, which controls the first part of the startup sequence. All code related to startup 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 tdeinit, which in turns launches +The starttde 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=, @@ -68,7 +68,7 @@ Startkde also launches kcminit, which performs initialization done by kcontrol 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 +process (and those should probably actually use kstartupconfig in starttde to be done even before tdeinit and daemons). After executing phase 0 modules kcminit returns and waits. @@ -91,7 +91,7 @@ i.e. launching all applications that were running during last session saving (usually logout). By this time KDE session is considered to be more or less ready and -ksmserver does the knotify startkde event (i.e. plays the login sound). +ksmserver does the knotify starttde event (i.e. plays the login sound). It also tells klauncher to perform autostart phase 2, kded to load all remaining autoload (i.e. kded phase 2) modules, kcminit to execute kcminit phase 2 (kcontrol modules that do initialization that can wait, diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index bd2fe440f..b53ae3d18 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -329,7 +329,7 @@ void KSMServer::autoStart2() DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" ); if( !defaultSession()) restoreLegacySession( KGlobal::config()); - KNotifyClient::event( 0, "startkde" ); // this is the time KDE is up, more or less + KNotifyClient::event( 0, "starttde" ); // this is the time KDE is up, more or less } void KSMServer::autoStart2Done() |