diff options
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/Makefile.am | 2 | ||||
| -rw-r--r-- | ksmserver/README | 10 | ||||
| -rw-r--r-- | ksmserver/legacy.cpp | 2 | ||||
| -rw-r--r-- | ksmserver/main.cpp | 2 | ||||
| -rw-r--r-- | ksmserver/server.cpp | 2 | ||||
| -rw-r--r-- | ksmserver/shutdown.cpp | 2 | ||||
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/startup.cpp | 2 | ||||
| -rw-r--r-- | ksmserver/startupdlg.cpp | 4 |
9 files changed, 15 insertions, 15 deletions
diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index 502ffb8e9..d9d4a55e3 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -38,7 +38,7 @@ pics_DATA = shutdownkonq.png update_DATA = ksmserver.upd update_SCRIPTS = move_session_config.sh -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update EXTRA_PROGRAMS = testsh diff --git a/ksmserver/README b/ksmserver/README index 29202255b..b2c26273b 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -54,7 +54,7 @@ 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 starttde scripts already launches tdeinit, which in turns launches -TDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded +TDE daemons like dcopserver, tdelauncher and kded. Kded loads autoloaded kded modules, i.e. those that have X-TDE-Kded-autoload=true in .desktop files. The exact way autoloading works is controlled by X-TDE-Kded-phase=, which may be 0, 1 or 2 (the default). Kded phase 0 means the module is @@ -68,13 +68,13 @@ Startkde also launches kcminit, which performs initialization done by kcontrol modules. There are three kcminit phases, 0, 1 and 2, controlled by X-TDE-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 starttde +process (and those should probably actually use tdestartupconfig in starttde 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 the window manager, as the WM is necessary before any windows are possibly -shown. When the WM is ready, ksmserver tells klauncher to perform autostart +shown. When the WM is ready, ksmserver tells tdelauncher to perform autostart phase 0 ($TDEHOME/share/autostart). There are 3 autostart phases, 0, 1 and 2, defined by X-TDE-autostart-phase, defaulting to 2. Phase 0 is reserved only for the actual visible base components of TDE, i.e. KDesktop and Kicker, @@ -84,7 +84,7 @@ waiting for autostart phase 0 until both KDesktop and Kicker are ready. Next step is telling the waiting kcminit to perform phase 1 - all kcminit modules that should be executed before TDE startup is considered done. -After that ksmserver tells klauncher to perform autostart phase 1, +After that ksmserver tells tdelauncher to perform autostart phase 1, i.e. launching normal components of TDE that should be available right after TDE startup, and after this session restore is performed, i.e. launching all applications that were running during last session @@ -92,7 +92,7 @@ saving (usually logout). By this time TDE session is considered to be more or less ready and 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 +It also tells tdelauncher 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, like launching daemons) and kdesktop to execute the user Autostart folder. diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 27e45611c..80f4e0984 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <twinmodule.h> diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 402f395e5..942c2fade 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -22,7 +22,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kdebug.h> #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "server.h" diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 6f93549d9..4d70b365d 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <kapplication.h> diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 2d9ce713a..729090961 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <kapplication.h> diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 254aa9966..c5a01353f 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -38,7 +38,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqeventloop.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> #include <kpushbutton.h> @@ -52,7 +52,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kimageeffect.h> #include <kdialog.h> #include <kseparator.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index fd383aa54..98829c419 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -67,7 +67,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <kapplication.h> diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp index 2d42dd3a2..0ec5d02d5 100644 --- a/ksmserver/startupdlg.cpp +++ b/ksmserver/startupdlg.cpp @@ -29,7 +29,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqeventloop.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> #include <kpushbutton.h> @@ -43,7 +43,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kimageeffect.h> #include <kdialog.h> #include <kseparator.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <dcopclient.h> #include <dcopref.h> |