diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-22 00:28:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-22 00:28:18 -0600 |
| commit | 7021f40c13f949b7cb5ded32d0241d648a43bf6c (patch) | |
| tree | aa1a5e4de2963edc6638783246b2ff25e98833aa /kdm | |
| parent | 0a2a54a02254ded760afd5b9c965c6bb71459d46 (diff) | |
| download | tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.tar.gz tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.zip | |
Part 1 of 2 of kdm rename
Diffstat (limited to 'kdm')
69 files changed, 755 insertions, 755 deletions
diff --git a/kdm/CMakeLists.txt b/kdm/CMakeLists.txt index 0e7a32789..08096f84c 100644 --- a/kdm/CMakeLists.txt +++ b/kdm/CMakeLists.txt @@ -13,8 +13,8 @@ # FIXME needs more checks (for kerberos, etc) # FIXME Xsession need some improvements -if( NOT DEFINED KDM_PAM_SERVICE ) - set( KDM_PAM_SERVICE "kde" CACHE INTERNAL "" ) +if( NOT DEFINED TDM_PAM_SERVICE ) + set( TDM_PAM_SERVICE "kde" CACHE INTERNAL "" ) endif( ) include( ConfigureChecks.cmake ) diff --git a/kdm/ChangeLog b/kdm/ChangeLog index c03c31e68..58a3014f6 100644 --- a/kdm/ChangeLog +++ b/kdm/ChangeLog @@ -1,4 +1,4 @@ -This change log contains only changes relevant to the KDM configuration, +This change log contains only changes relevant to the TDM configuration, startup and packaging. Bug fixes are not listed, and feature changes only if they affect the configuration. @@ -28,7 +28,7 @@ if they affect the configuration. 2005-01-09 Oswald Buddenhagen <ossi@kde.org> - * Merged sessreg into kdm. Option UseSessReg. + * Merged sessreg into tdm. Option UseSessReg. 2004-08-14 Oswald Buddenhagen <ossi@kde.org> @@ -38,7 +38,7 @@ if they affect the configuration. 2004-07-28 Oswald Buddenhagen <ossi@kde.org> * Added control sockets. Control FiFos are now obsolete. - Added control socket command line client 'kdmctl'. + Added control socket command line client 'tdmctl'. * The Setup program is now run even for automatic logins. Setup, Startup and Reset have the arg "auto" for automatic logins. @@ -80,7 +80,7 @@ if they affect the configuration. 2004-03-16 Oswald Buddenhagen <ossi@kde.org> - * Changed AllowClose default to true; only the default kdmrc + * Changed AllowClose default to true; only the default tdmrc disables it for local display now. 2004-03-11 Chris Cheney <ccheney@cheney.cx> @@ -96,12 +96,12 @@ if they affect the configuration. 2004-02-28 Oswald Buddenhagen <ossi@kde.org> - * The default Xsession no longer tries to merge kdm's PATH into the + * The default Xsession no longer tries to merge tdm's PATH into the one set up by the shell startup scripts. Instead, kde.desktop contains a full pathname and starttde fixes up PATH if necessary. * The default Xsession will emulate the startup behaviour of more shells, in particular bash, zsh and csh/tcsh. - * Setting up the session log is now done by kdm, not the Session + * Setting up the session log is now done by tdm, not the Session script; option ClientLogFile. 2004-01-25 Oswald Buddenhagen <ossi@kde.org> @@ -128,15 +128,15 @@ if they affect the configuration. 2003-10-27 Oswald Buddenhagen <ossi@kde.org> - * KDM now complies with the input model of PAM. The greeter has an + * TDM now complies with the input model of PAM. The greeter has an interface for conversation plugins, so alternative authentication mechanisms can be handled; options PluginsLogin & PluginsShutdown. * Password-less and automatic logins now use a separate PAM service - (${KDM_PAM_SERVICE}-np). + (${TDM_PAM_SERVICE}-np). 2003-10-17 Oswald Buddenhagen <ossi@kde.org> - * Add --with-kdm-xconsole configure switch. No need to patch + * Add --with-tdm-xconsole configure switch. No need to patch Makefile.am to enable the built-in xconsole anymore. 2003-09-23 Oswald Buddenhagen <ossi@kde.org> @@ -148,7 +148,7 @@ if they affect the configuration. - "custom" to ~/.xsession * The previous session type choice is now saved in a different file (~/.dmrc) in a different format (ini-file); the SessSaveFile option - is gone. Optionally KDM can be configured to store all .dmrc files + is gone. Optionally TDM can be configured to store all .dmrc files in a common directory (option DmrcDir); this can be useful for AFS based installations. * The location of the administratively set user faces is now specified @@ -158,7 +158,7 @@ if they affect the configuration. The spec for the above changes is shared with GDM, so packagers should choose common directories. - * The kdmsts file moved to /var/lib/kdm by default; option DataDir. + * The tdmsts file moved to /var/lib/tdm by default; option DataDir. * Nuked the AutoLoginSession option; i don't think it was useful at all and it can be emulated anyway. @@ -192,7 +192,7 @@ if they affect the configuration. This code is not built by default; uncomment the first three lines in kfrontend/Makefile.am to enable it. * The DaemonMode option is gone. The command line switches -daemon and - -nodaemon still exist, but are mostly unnecessary, as KDM can decide + -nodaemon still exist, but are mostly unnecessary, as TDM can decide what to do based on the parent process ID. * The AutoLogin option and the -autolog/-noautolog switches are gone. * The AutoLogin1st option is gone. @@ -207,11 +207,11 @@ if they affect the configuration. 2002-08-10 Oswald Buddenhagen <ossi@kde.org> - * Renamed kdmdesktop to krootimage, moved it back into the KDM source + * Renamed tdmdesktop to krootimage, moved it back into the TDM source tree, and changed its command line * krootimage will be automatically invoked by the greeter by default; option UseBackground - * Chucked out the [Desktop0] section from kdmrc. Instead, the + * Chucked out the [Desktop0] section from tdmrc. Instead, the location of the config file containing such a section is specified with the BackgroundRc option. * User images can now be optionally fetched from the users's home @@ -231,7 +231,7 @@ if they affect the configuration. 2002-03-10 Oswald Buddenhagen <ossi@kde.org> * Added InteractiveSd option. This is not really implemented yet, - so enabling it just makes KDM deny the existence of the shutdown + so enabling it just makes TDM deny the existence of the shutdown condition/timing options. * The Setup script is now executed synchronously. Long-lasting commands should be put in the background explicitly. @@ -259,7 +259,7 @@ if they affect the configuration. * The defaults of the options Xservers, Session, Setup, Startup, Reset and PidFile are now back to the saner XDM defaults, - so KDM works even without config files. + so TDM works even without config files. * Changed option ShowUsers: All -> NotHidden * Renamed the option Users to SelectedUsers and NoUsers to HiddenUsers. * The GUIStyle option now groks all installed widget styles. @@ -288,9 +288,9 @@ if they affect the configuration. 2001-07-10 Oswald Buddenhagen <ossi@kde.org> - * Added the tool 'genkdmconf'. It's supposed to create a suitable - configuration for KDM during 'make install' by merging new defaults - with a previous XDM/KDM config (if any is found). + * Added the tool 'gentdmconf'. It's supposed to create a suitable + configuration for TDM during 'make install' by merging new defaults + with a previous XDM/TDM config (if any is found). 2001-07-03 Oswald Buddenhagen <ossi@kde.org> @@ -318,26 +318,26 @@ if they affect the configuration. the DebugLevel resource is gone * The ErrorLogFile resource is gone * The greeter module libKdmGreet.so has been converted to an - executable named kdm_greet; the external config parser is now - named kdm_config. The resource GreeterLib and the command line + executable named tdm_greet; the external config parser is now + named tdm_config. The resource GreeterLib and the command line option -getcfg (and -cfg2get) are gone, as the locations of the config parser and greeter are derived from the location of the - kdm executable - * The config files are all located in ${kde_confdir}/kdm now; the + tdm executable + * The config files are all located in ${kde_confdir}/tdm now; the defaults for Setup & Session were adapted to this. - * The keys in kdmrc were reorganized: - - [KDM]/ShutdownButton -> [X-<dpy>-Greeter]/(ShutdownButton & + * The keys in tdmrc were reorganized: + - [TDM]/ShutdownButton -> [X-<dpy>-Greeter]/(ShutdownButton & ShutdownNeedsRoot) - - [KDM]/Shutdown -> [Shutdown]/HaltCmd - - [KDM]/Restart -> [Shutdown]/RebootCmd - - [KDM]/LogoArea -> [X-*-Greeter]/ {None,Logo,Clock} - - remaining keys from [KDM] -> [X-*-Greeter]/ + - [TDM]/Shutdown -> [Shutdown]/HaltCmd + - [TDM]/Restart -> [Shutdown]/RebootCmd + - [TDM]/LogoArea -> [X-*-Greeter]/ {None,Logo,Clock} + - remaining keys from [TDM] -> [X-*-Greeter]/ - [Lilo]/Lilo -> [Shutdown]/UseLilo - [Lilo]/LiloCommand -> [Shutdown]/LiloCmd - [Lilo]/LiloMap -> [Shutdown]/ - [Locale]/Language -> [X-*-Greeter]/ (Country key dropped) - * KDM will no longer use kdm-config; most of its resources were - absorbed into kdmrc: + * TDM will no longer use tdm-config; most of its resources were + absorbed into tdmrc: - Servers -> [General]/Xservers - RequestPort -> [Xdmcp]/(Port & Enable) - DaemonMode -> [General]/ @@ -366,11 +366,11 @@ if they affect the configuration. * In GreetString the HOSTNAME substitution was replaced with the %%, %d, %h, %n, %s, %r & %m expandos * EchoMode does not understand "NoStars" any more. Use "NoEcho". - * Defaults changed: AuthDir to /var/lib/kdm, KeyFile to - $kdm_confdir/kdmkeys, Xservers to $kdm_confdir/Xservers, Xaccess to - $kdm_confdir/Xaccess, Startup to $kdm_confdir/Xstartup, Reset to - $kdm_confdir/Xreset, removed kde2 from SessionTypes - * The previous user is now saved in $kdm_confdir/kdmsts, not kdmrc + * Defaults changed: AuthDir to /var/lib/tdm, KeyFile to + $tdm_confdir/tdmkeys, Xservers to $tdm_confdir/Xservers, Xaccess to + $tdm_confdir/Xaccess, Startup to $tdm_confdir/Xstartup, Reset to + $tdm_confdir/Xreset, removed kde2 from SessionTypes + * The previous user is now saved in $tdm_confdir/tdmsts, not tdmrc * Added option SessSaveFile, defaulting to .wmrc * Command line option changes: - -server, -udpPort, -resources, -session and -xrm are gone @@ -386,11 +386,11 @@ if they affect the configuration. * %DMNAME% and %DMPATH% are expanded in string resources; changed the defaults for PidFile and ConfigFile accordingly - - the latter resulting in KDM now using kdm-config, NOT xdm-config + the latter resulting in TDM now using tdm-config, NOT xdm-config * Use external config parser to merge platform-specific (that is, KDE-like) configuration data into the XDM resources; command line options -getcfg (default %DMPATH%_getcfg) and -cfg2get (no default, - meaning kdm_getcfg will use $kde_confdir/kdmrc). + meaning tdm_getcfg will use $kde_confdir/tdmrc). * Changed "kde" to "kde2" in the default SessionTypes * Stolen idea for console mode handling from dtlogin; options ConsoleMode and AllowConsoleMode are gone; extension to Xservers @@ -427,13 +427,13 @@ if they affect the configuration. resource NoPassUsers * Added auto-re-login on XServer crash; resource & option AutoReLogin - The kdmrc options and xdm-config resources are "ORed", i.e., if + The tdmrc options and xdm-config resources are "ORed", i.e., if either is enabled, the function is enabled. The command line options -autolog/-noautolog and the resource AutoLogin can be used to disable auto-login and password-less login at once. * Added displaying the previously logged in user in the "Login" - field; option ShowPrevious. The previous user is saved in kdmrc, + field; option ShowPrevious. The previous user is saved in tdmrc, section [Previous]. 2000-12-07 Oswald Buddenhagen <ossi@kde.org> @@ -454,8 +454,8 @@ if they affect the configuration. 2000-10-10 Steffen Hansen <hansen@kde.org> - * Made kdmdesktop read the [Desktop0] section from kdmrc instead - of kdmdesktoprc. + * Made tdmdesktop read the [Desktop0] section from tdmrc instead + of tdmdesktoprc. 2000-09-07 Waldo Bastian <bastian@kde.org> @@ -483,8 +483,8 @@ if they affect the configuration. 1999-11-15 Matthias Hoelzer-Kluepfel <hoelzer@kde.org> - * kdmdesktop replaced with ../kdesktop/kdmdesktop. Uses new config - file (kdmdesktoprc) with new options (all in section [Desktop0]): + * tdmdesktop replaced with ../kdesktop/tdmdesktop. Uses new config + file (tdmdesktoprc) with new options (all in section [Desktop0]): 1999-07-01 Steffen Hansen <hansen@kde.org> @@ -494,7 +494,7 @@ if they affect the configuration. * Added next boot OS selection via LiLo; options [Lilo] Lilo, LiloCommand & LiloMap - * Added button to switch to console mode; option [KDM] ConsoleMode + * Added button to switch to console mode; option [TDM] ConsoleMode 1999-03-01 Stephan Kulow <coolo@kde.org> @@ -502,7 +502,7 @@ if they affect the configuration. 1998-10-08 Thomas Tanghus <tanghus@earthling.net> - * [KDMDESKTOP] option changes: + * [TDMDESKTOP] option changes: - BackgroundPictureTile, BackgroundPictureCenter, FancyBackground -> BackgroundPictureMode {None,Tile,Center,Scale, TopLeft,TopRight,BottomLeft,BottomRight,Fancy} @@ -513,7 +513,7 @@ if they affect the configuration. * Change defaults: - Setup: "" -> XDMDIR/Xsetup - - PidFile: "" -> FreeBSD: /var/run/kdm.pid, others: XDMDIR/kdm-pid + - PidFile: "" -> FreeBSD: /var/run/tdm.pid, others: XDMDIR/tdm-pid - Session: "XBINDIR/xterm -ls" -> XDMDIR/Xsession - UserPath & SystemPath: no /usr/ucb for Linux & FreeBSD diff --git a/kdm/Makefile.am b/kdm/Makefile.am index 106e47862..0f038d4a7 100644 --- a/kdm/Makefile.am +++ b/kdm/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = . backend kfrontend -PAM = @KDM_PAM_SERVICE@ +PAM = @TDM_PAM_SERVICE@ noinst_DATA=config.ci -kdmdocdir = $(datadir)/doc/kdm -kdmdoc_DATA = README +tdmdocdir = $(datadir)/doc/tdm +tdmdoc_DATA = README install-data-local: -@test -n "$(DESTDIR)" || test -z "$(PAM)" || { $(top_srcdir)/mkpamserv $(PAM) && $(top_srcdir)/mkpamserv -P $(PAM)-np; } @@ -15,6 +15,6 @@ config.ci: $(srcdir)/config.def $(srcdir)/confproc.pl CLEANFILES = config.ci -### this is *only* for the kdm home page maintainer! ### +### this is *only* for the tdm home page maintainer! ### hp: - scp README ChangeLog TODO devel-home:files/kdm + scp README ChangeLog TODO devel-home:files/tdm diff --git a/kdm/README b/kdm/README index 4b0c8d6f4..6c0fce18b 100644 --- a/kdm/README +++ b/kdm/README @@ -1,78 +1,78 @@ -This is the K Display Manager (KDM) for KDE 3.4, +This is the K Display Manager (TDM) for KDE 3.4, the KDE replacement for the X Display Manager (XDM). -Semi-official home page: http://devel-home.kde.org/~ossi/sw/kdm.html +Semi-official home page: http://devel-home.kde.org/~ossi/sw/tdm.html -configure options that affect KDM +configure options that affect TDM --------------------------------- --with-pam[=service] - Compile KDM (and other parts of tdebase) with PAM support. The default + Compile TDM (and other parts of tdebase) with PAM support. The default service is "kde". PAM is automatically used if found. ---with-kdm-pam=service - Override the PAM service used specifically by KDM. Depends on --with-pam. +--with-tdm-pam=service + Override the PAM service used specifically by TDM. Depends on --with-pam. --with-shadow - Compile KDM (and other parts of tdebase) with shadow password support. - Shadow passwords are automatically used if found. This affects KDM only + Compile TDM (and other parts of tdebase) with shadow password support. + Shadow passwords are automatically used if found. This affects TDM only if PAM is not used. --with-krb4[=path] - Compile KDM (and the LDAP KIO slave) with KTH Kerberos 4 support. Note + Compile TDM (and the LDAP KIO slave) with KTH Kerberos 4 support. Note that this does not work with the Kerberos 4 compatibility layer found in - MIT Kerberos 5. This affects KDM only if PAM is not used. + MIT Kerberos 5. This affects TDM only if PAM is not used. --with-afs - Compile KDM with AFS support. Depends on --with-krb4. + Compile TDM with AFS support. Depends on --with-krb4. --with-krb5auth[=path] --with-rpcauth - Compile KDM with Kerberos 5 resp. secure RPC support for X authorization + Compile TDM with Kerberos 5 resp. secure RPC support for X authorization cookies. It's pretty pointless to enable this if you don't use an X server that supports it. - If you want user authentication against a Kerberos realm, compile KDM with + If you want user authentication against a Kerberos realm, compile TDM with PAM support and use the appropriate module. --without-xdmcp - Compile KDM without XDMCP support. + Compile TDM without XDMCP support. ---with-kdm-xconsole - Compile KDM with a builtin "xconsole" replacement in the greeter. I don't +--with-tdm-xconsole + Compile TDM with a builtin "xconsole" replacement in the greeter. I don't consider this too useful, but SuSE wanted it, so it's there. ;) -KDM's file system layout +TDM's file system layout ------------------------ ${kde_confdir} is usually ${prefix}/share/config ${kde_datadir} is usually ${prefix}/share/apps The indented locations are envisioned for a configuration shared with GDM. -${kde_confdir}/kdm/{kdmrc,Xservers,Xaccess,Xwilling,...} -${kde_datadir}/kdm/sessions/*.desktop +${kde_confdir}/tdm/{tdmrc,Xservers,Xaccess,Xwilling,...} +${kde_datadir}/tdm/sessions/*.desktop /etc/X11/sessions/,/usr/share/xsessions/ -${kde_datadir}/kdm/pics/users/ -${kde_datadir}/kdm/pics/ -${kde_datadir}/kdm/faces/*.face{,.icon} +${kde_datadir}/tdm/pics/users/ +${kde_datadir}/tdm/pics/ +${kde_datadir}/tdm/faces/*.face{,.icon} /usr/share/faces/ /var/run/xauth/A* /var/run/xdmctl/xdmctl* -/var/run/kdm.pid -/var/lib/kdm/kdmsts +/var/run/tdm.pid +/var/lib/tdm/tdmsts <site-specific>/*.dmrc $HOME/.face{,.icon} $HOME/.dmrc -How to setup KDM +How to setup TDM ---------------- -KDM's config files are all located in ${kde_confdir}/kdm. +TDM's config files are all located in ${kde_confdir}/tdm. "make install" will create a probably working configuration, either by -deriving it from an already present KDM/XDM installation or by using +deriving it from an already present TDM/XDM installation or by using defaults if no previous installation is found. You can change the configuration from the KDE Control Center. You will @@ -101,29 +101,29 @@ that's what will be saved to ~/.dmrc and what DESKTOP_SESSION will be set to. For every magic Exec constant a session type of the same name exists. Unless your system is configured differently already, you should create a -directory ${kde_confdir}/kdm/sessions and add this to kdmrc: +directory ${kde_confdir}/tdm/sessions and add this to tdmrc: [X-*-Core] -SessionsDirs=${kde_confdir}/kdm/sessions,${kde_datadir}/kdm/sessions +SessionsDirs=${kde_confdir}/tdm/sessions,${kde_datadir}/tdm/sessions (Note that you must use actual paths instead of variables, see the section -about KDM's file system layout.) +about TDM's file system layout.) Do any changes only in the config directory - any changes in the data directory will be lost after the next KDE update. To override a session type, copy the .desktop file from the data dir to the config dir and edit it at will. Removing the shipped session types can be accomplished by "shadowing" them with .desktop files containing Hidden=true. -For the magic session types no .desktop files exist by default, but KDM +For the magic session types no .desktop files exist by default, but TDM pretends they would, so you can override them like any other type. I guess you already know how to add a new session type by now. ;-) -Running KDM from init +Running TDM from init --------------------- NOTE, that this description applies to RedHat 5.x and must be adapted for -other distributions/systems. Generally I'd advise _against_ starting KDM +other distributions/systems. Generally I'd advise _against_ starting TDM directly from init - better use a proper init script, possibly by slightly modifying the XDM init script shipped by your distribution. @@ -135,13 +135,13 @@ modifying the XDM init script shipped by your distribution. Replace it with: - x:5:respawn:/opt/kde/bin/kdm + x:5:respawn:/opt/kde/bin/tdm - This tells init(8) to respawn KDM, the KDE display manager, when + This tells init(8) to respawn TDM, the KDE display manager, when the system is in run level 5. - Note that KDM does not need the -nodaemon option. + Note that TDM does not need the -nodaemon option. - To start KDM, either run (as root) /sbin/telinit 5 (to switch to + To start TDM, either run (as root) /sbin/telinit 5 (to switch to run level 5), or (this is risky! don't do it until you _know_ you want the system to boot into this every time!) edit /etc/inittab and change the line: @@ -153,14 +153,14 @@ modifying the XDM init script shipped by your distribution. id:5:initdefault: If you do the latter step, then every time your system boots - successfully it will go into run level 5 and run KDM, + successfully it will go into run level 5 and run TDM, presenting you the exceedingly cute KDE login screen. The command sockets ------------------- -This is a feature you can use to remote-control KDM. It's mostly intended +This is a feature you can use to remote-control TDM. It's mostly intended for use by ksmserver and kdesktop from a running session, but other applications are possible as well. @@ -209,7 +209,7 @@ Commands for all sockets: "caps" - Returns a list this socket's capabilities: - "kdm" - identifies kdm, in case some other DM implements this protocol, too. + "tdm" - identifies tdm, in case some other DM implements this protocol, too. "list", "activate", "lock", "suicide", "login" - the respective command is supported. "bootoptions" - the "listbootoptions" command and the "=" option to @@ -272,7 +272,7 @@ Commands for all sockets: - end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus-sign, the start time is added. Minus one means wait infinitely. If end is through and active - sessions are still running, KDM can do one of the following: + sessions are still running, TDM can do one of the following: * "cancel" - give up the shutdown. * "force" - shut down nonetheless. * "forcemy" - shut down nonetheless if all active sessions belong to the @@ -304,18 +304,18 @@ Commands for all sockets: There are two ways of using the sockets: - Connecting them directly. FifoDir is exported as $DM_CONTROL; the name of per-display sockets can be derived from $DISPLAY. -- By using the kdmctl command (e.g., from within a shell script). - Try "kdmctl -h" to find out more. +- By using the tdmctl command (e.g., from within a shell script). + Try "tdmctl -h" to find out more. Here is an example bash script "reboot into FreeBSD": -if kdmctl | grep -q shutdown; then +if tdmctl | grep -q shutdown; then IFS=$'\t' - set -- `kdmctl listbootoptions` + set -- `tdmctl listbootoptions` if [ "$1" = ok ]; then fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}') if [ -n "$fbsd" ]; then - kdmctl shutdown reboot "=$fbsd" ask > /dev/null + tdmctl shutdown reboot "=$fbsd" ask > /dev/null else echo "FreeBSD boot unavailable." fi @@ -332,7 +332,7 @@ fi More input! ;-) -KDM accepts two command line options related to logging: +TDM accepts two command line options related to logging: -debug <n> <n> is a decimal or hexadecimal (prefix 0x) number. @@ -363,10 +363,10 @@ KDM accepts two command line options related to logging: -logfile <file> <file> is the file to log various messages to. The default log file is - /var/log/kdm.log. For internal reasons there is no option in kdmrc to - permanently specify the log file location. If you redirect KDM's - standard error output to a file, KDM will log there. - If KDM is configured to use syslog (and it _very_ probably is on any + /var/log/tdm.log. For internal reasons there is no option in tdmrc to + permanently specify the log file location. If you redirect TDM's + standard error output to a file, TDM will log there. + If TDM is configured to use syslog (and it _very_ probably is on any modern system), all internally generated messages are logged to the "daemon" facility. The log usually can be found in /var/log/debug.log and /var/log/daemon.log; make sure that daemon.* is logged (look at @@ -377,29 +377,29 @@ KDM accepts two command line options related to logging: Send me all the logs together with a detailed description of what you did and what happened. If your problem is related to a specific configuration, -you should also attach a tar.gz archive of your KDM config directory. +you should also attach a tar.gz archive of your TDM config directory. -If I request a backtrace from you and KDM didn't create one yet via the +If I request a backtrace from you and TDM didn't create one yet via the usual drkonqi procedure, you'll have to do that yourself. The keyphrase is "attaching gdb". How exactly this is done depends on the part that crashes: - master daemon. Actually you should never need to attach to it, as you can start it within the debugger already: - # gdb --args kdm -nodaemon -debug 7 + # gdb --args tdm -nodaemon -debug 7 (gdb) run - display subdaemon. Find (using ps) the process with a name like "-:0" (where :0 is actually the display this process is for). This process' PPID is the master daemon. Attach to it this way: - # gdb kdm <the PID you found> + # gdb tdm <the PID you found> (gdb) cont If the subdaemon crashes before you can attach, add 16 to the debug flags - when you start KDM. + when you start TDM. - config reader. You will have to add 32 to the debug flags almost certainly. The PPID will be the master daemon as well. - # gdb kdm_config $(pidof kdm_config) + # gdb tdm_config $(pidof tdm_config) (gdb) cont - greeter. If it's too fast, add 64 to -debug. The PPID will be the subdaemon. - # gdb kdm_greet $(pidof kdm_greet) + # gdb tdm_greet $(pidof tdm_greet) (gdb) cont The simplification with "pidof" works only if you have only one display, otherwise you have to find the PID manually (by using ps -fx). @@ -426,7 +426,7 @@ configure flag if at all possible. Random rambings and license information --------------------------------------- -Version 0.1 of KDM is copyright +Version 0.1 of TDM is copyright Matthias Ettrich <ettrich@trolltech.com> All later versions copyright: (C) 1997-2000 Steffen Hansen <hansen@kde.org> @@ -443,7 +443,7 @@ Duncan Haldane for investigation of PAM issues. Stephan Kulow for helping with the autoconf stuff. Martin Baehr for intensive testing and writing the sample Xsession scripts. Harald Hoyer <Harald.Hoyer@redhat.de> for the (now obsoleted) chooser. -SuSE for employing me (ossi) for three months to work on kdm. +SuSE for employing me (ossi) for three months to work on tdm. BasysKom for sponsoring my (ossi's) work on the conversation plugin stuff. ... and _many_ others ... @@ -41,14 +41,14 @@ theming (#37349): - add support for XRandR (#48602) save these options to .dmrc? -- per-display sections in .dmrc. read-only, as far as kdm is concerned, as +- per-display sections in .dmrc. read-only, as far as tdm is concerned, as otherwise the GUI would become insanely complex. - make config position independent - parse /etc/kderc? -- merge multiple kdmrcs in the style of kconfig. how to set section priorities? -- genkdmconf: treat backgroundrc as an ini file, not as a text blob -- add proper quoting and dequoting to genkdmconf ini parser & writer +- merge multiple tdmrcs in the style of kconfig. how to set section priorities? +- gentdmconf: treat backgroundrc as an ini file, not as a text blob +- add proper quoting and dequoting to gentdmconf ini parser & writer - write generic conversation plugin - write modern conv plugin. or maybe this should be a parallel vs. serial @@ -113,7 +113,7 @@ and the session. .dmrc later affects only the session, not the greeter. - add a minimalistic window manager to the greeter (#17716, #51039) - write a separate configurator application, as kcontrol does not scale well - enough to cover all of kdm's options. + enough to cover all of tdm's options. - Different logos for each session type (see #74500) - User pictures in logo field @@ -143,7 +143,7 @@ and the session. .dmrc later affects only the session, not the greeter. - lbxproxy integration (tell ghakko) -- in kcm_kdm, detach backgroundrc change status from kdmrc change status. +- in kcm_tdm, detach backgroundrc change status from tdmrc change status. - when a shutdown is scheduled, don't remove all login possibilities. instead, display a warning in the greeter. use SIGUSR1 to notify already @@ -173,7 +173,7 @@ internal stuff: - implement auto-re-login by keeping the display subdaemon alive instead of starting a new one and feeding it the old auth data. - options for running the greeter and the core unprivileged. problem: xauth. -- rethink the coupling of the kdm components, particularily the config reader. +- rethink the coupling of the tdm components, particularily the config reader. options: - keep things basically as-is, make the Xaccess interface even more flexible, add capability flags. diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt index b93174e4c..cd98b3a9c 100644 --- a/kdm/backend/CMakeLists.txt +++ b/kdm/backend/CMakeLists.txt @@ -21,11 +21,11 @@ link_directories( ${DBUS_TQT_LIBRARY_DIRS} ) -##### kdm (executable) ########################## +##### tdm (executable) ########################## add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def ) set_property( SOURCE auth.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) @@ -35,7 +35,7 @@ else() set( XDMCP_LIBRARIES "" ) endif() -tde_add_executable( kdm +tde_add_executable( tdm SOURCES access.c auth.c bootman.c choose.c client.c consolekit.c ctrl.c daemon.c dm.c dpylist.c error.c genauth.c diff --git a/kdm/backend/Makefile.am b/kdm/backend/Makefile.am index 58c2a9e43..6b5779d51 100644 --- a/kdm/backend/Makefile.am +++ b/kdm/backend/Makefile.am @@ -6,8 +6,8 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \ $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \ $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4) -bin_PROGRAMS = kdm -kdm_SOURCES = \ +bin_PROGRAMS = tdm +tdm_SOURCES = \ access.c \ auth.c \ bootman.c \ @@ -44,4 +44,4 @@ EXTRA_DIST = printf.c noinst_HEADERS = dm.h dm_socket.h dm_error.h dm_auth.h greet.h # for unsermake (automake is handled by SUBDIRS in ../) -kdm_COMPILE_FIRST = ../config.ci +tdm_COMPILE_FIRST = ../config.ci diff --git a/kdm/backend/client.c b/kdm/backend/client.c index 56d9fa09f..0cf4e216b 100644 --- a/kdm/backend/client.c +++ b/kdm/backend/client.c @@ -1305,7 +1305,7 @@ StartClient() env = setEnv( env, "SHELL", p->pw_shell ); env = setEnv( env, "HOME", p->pw_dir ); if (cursource == PWSRC_AUTOLOGIN) - env = setEnv (env, "KDM_AUTOLOGIN", curuser); + env = setEnv (env, "TDM_AUTOLOGIN", curuser); #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS) if (krbtkfile[0] != '\0') env = setEnv( env, "KRBTKFILE", krbtkfile ); diff --git a/kdm/backend/ctrl.c b/kdm/backend/ctrl.c index f7ed05308..622c9370d 100644 --- a/kdm/backend/ctrl.c +++ b/kdm/backend/ctrl.c @@ -520,7 +520,7 @@ processCtrl( const char *string, int len, int fd, struct display *d ) if (fd >= 0 && !strcmp( ar[0], "caps" )) { if (ar[1]) goto exce; - Reply( "ok\tkdm\tlist\t" ); + Reply( "ok\ttdm\tlist\t" ); if (bootManager != BO_NONE) Reply( "bootoptions\t" ); if (d) { diff --git a/kdm/backend/error.c b/kdm/backend/error.c index 0680ed3a5..93ec40e70 100644 --- a/kdm/backend/error.c +++ b/kdm/backend/error.c @@ -113,7 +113,7 @@ InitErrorLog( const char *errorLogFile ) # endif # define WARNMSG \ "********************************************************************************\n" \ - "Note that your system uses syslog. All of kdm's internally generated messages\n" \ + "Note that your system uses syslog. All of tdm's internally generated messages\n" \ "(i.e., not from libraries and external programs/scripts it uses) go to the\n" \ "daemon.* syslog facility; check your syslog configuration to find out to which\n" \ "file(s) it is logged." PAMLOG "\n" \ diff --git a/kdm/config.def b/kdm/config.def index 8f91bf6e2..a7ec59076 100644 --- a/kdm/config.def +++ b/kdm/config.def @@ -30,8 +30,8 @@ #define RCVERMAJOR 2 #define RCVERMINOR 3 -#define KDMCONF KDE_CONFDIR "/kdm" -#define KDMDATA KDE_DATADIR "/kdm" +#define TDMCONF KDE_CONFDIR "/tdm" +#define TDMDATA KDE_DATADIR "/tdm" #ifdef _AIX # define HALT_CMD "/usr/sbin/shutdown -h now" @@ -89,16 +89,16 @@ # lines). # Section headers are "condensation seeds" for the Instance:s in the key # definitions below. -<kdmrc> - &kdm; master configuration file +<tdmrc> + &tdm; master configuration file _ Please note: Settings in this file are sometimes ignored (overridden). - The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d + The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d for theme-related settings which, if found, take precedence. The possibly overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme. - See /usr/share/doc/kdm/README.Debian for details + See /usr/share/doc/tdm/README.Debian for details _ - Definition: the greeter is the login dialog, i.e., the part of &kdm; + Definition: the greeter is the login dialog, i.e., the part of &tdm; which the user sees. _ You can configure every X-display individually. @@ -134,7 +134,7 @@ _ Every comment applies to the following section or key. Note that all comments will be lost if you change this file with the kcontrol frontend. - The defaults refer to &kdm;'s built-in values, not anything set in this file. + The defaults refer to &tdm;'s built-in values, not anything set in this file. _ Special characters need to be backslash-escaped (leading and trailing spaces (\\s), tab (\\t), linefeed (\\n), carriage return (\\r) and the @@ -151,7 +151,7 @@ [Shutdown] - Rough estimations about how many seconds &kdm; will spend at most on + Rough estimations about how many seconds &tdm; will spend at most on - opening a connection to the X-server (OpenTime) if the attempt - times out: OpenTimeout - is refused: OpenRepeat * OpenDelay @@ -179,26 +179,26 @@ Greeter config for 1st local display [X-:0-Greeter] -</kdmrc> +</tdmrc> -# The contents of this section are copied into kdmrc-ref.docbook. +# The contents of this section are copied into tdmrc-ref.docbook. # The macro %REF% is replaced with the accumulated Description:s from the key # definitions below. <docu> -<chapter id="kdm-files"> -<title>The Files &kdm; Uses for Configuration</title> +<chapter id="tdm-files"> +<title>The Files &tdm; Uses for Configuration</title> -<para>This chapter documents the files that control &kdm;'s behavior. +<para>This chapter documents the files that control &tdm;'s behavior. Some of this can be also controlled from the &kcontrol; module, but not all.</para> -<sect1 id="kdmrc"> -<title>&kdmrc; - The &kdm; master configuration file</title> +<sect1 id="tdmrc"> +<title>&tdmrc; - The &tdm; master configuration file</title> <para>The basic format of the file is <quote>INI-like</quote>. Options are key/value pairs, placed in sections. Everything in the file is case sensitive. -Syntactic errors and unrecognized key/section identifiers cause &kdm; to +Syntactic errors and unrecognized key/section identifiers cause &tdm; to issue non-fatal error messages.</para> <para>Lines beginning with <literal>#</literal> are comments; empty lines @@ -309,7 +309,7 @@ have the usual meaning; the backslash quotes everything (not only special characters). Note that the backslashes need to be doubled because of the two levels of quoting.</para> -<note><para>A pristine &kdmrc; is very thoroughly commented. +<note><para>A pristine &tdmrc; is very thoroughly commented. All comments will be lost if you change this file with the kcontrol frontend.</para></note> @@ -317,13 +317,13 @@ kcontrol frontend.</para></note> </sect1> -<sect1 id="kdmrc-xservers"> +<sect1 id="tdmrc-xservers"> <title>Specifying permanent &X-Server;s</title> <para>Each entry in the <option>StaticServers</option> list indicates a display which should constantly be managed and which is not using &XDMCP;. This method is typically used only for -local &X-Server;s that are started by &kdm;, but &kdm; can manage externally +local &X-Server;s that are started by &tdm;, but &tdm; can manage externally started (<quote>foreign</quote>) &X-Server;s as well, may they run on the local machine or rather remotely.</para> @@ -342,7 +342,7 @@ The display name of &XDMCP; displays is derived from the display's address by reverse host name resolution. For configuration purposes, the <literal>localhost</literal> prefix from locally running &XDMCP; displays is <emphasis>not</emphasis> stripped to make them distinguishable from local -&X-Server;s started by &kdm;.</para> +&X-Server;s started by &tdm;.</para> <para>The <replaceable>display class</replaceable> portion is also used in the display-specific sections. This is useful if you have a large collection of @@ -350,11 +350,11 @@ similar displays (such as a corral of X terminals) and would like to set options for groups of them. When using &XDMCP;, the display is required to specify the display class, so the manual for your particular X terminal should document the display -class string for your device. If it does not, you can run &kdm; in debug +class string for your device. If it does not, you can run &tdm; in debug mode and <command>grep</command> the log for <quote>class</quote>.</para> <para>The displays specified in <option>ReserveServers</option> will not be -started when &kdm; starts up, but when it is explicitly requested via +started when &tdm; starts up, but when it is explicitly requested via the command socket (or <acronym>FiFo</acronym>). If reserve displays are specified, the &kde; menu will have a <guilabel>Start New Session</guilabel> item near the bottom; use that to @@ -362,26 +362,26 @@ activate a reserve display with a new login session. The monitor will switch to the new display, and you will have a minute to login. If there are no more reserve displays available, the menu item will be disabled.</para> -<para>When &kdm; starts a session, it sets up authorization data for the -&X-Server;. For local servers, &kdm; passes +<para>When &tdm; starts a session, it sets up authorization data for the +&X-Server;. For local servers, &tdm; passes <command><option>-auth</option> <filename><replaceable>filename</replaceable></filename></command> on the &X-Server;'s command line to point it at its authorization data. -For &XDMCP; displays, &kdm; passes the authorization data to the &X-Server; +For &XDMCP; displays, &tdm; passes the authorization data to the &X-Server; via the <quote>Accept</quote> &XDMCP; message.</para> </sect1> -<sect1 id="kdmrc-xaccess"> +<sect1 id="tdmrc-xaccess"> <title>&XDMCP; access control</title> <para>The file specified by the <option>AccessFile</option> option provides -information which &kdm; uses to control access from displays requesting service +information which &tdm; uses to control access from displays requesting service via &XDMCP;. The file contains four types of entries: entries which control the response to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which control the response to <quote>Indirect</quote> queries, macro definitions for <quote>Indirect</quote> entries, and entries which control on which network -interfaces &kdm; listens for &XDMCP; queries. +interfaces &tdm; listens for &XDMCP; queries. Blank lines are ignored, <literal>#</literal> is treated as a comment delimiter causing the rest of that line to be ignored, and <literal>\</literal> causes an immediately following newline to be ignored, allowing indirect host @@ -406,7 +406,7 @@ Preceding the entry with a <literal>!</literal> character causes hosts which match that entry to be excluded. To only respond to <quote>Direct</quote> queries for a host or pattern, it can be followed by the optional <literal>NOBROADCAST</literal> keyword. -This can be used to prevent a &kdm; server from appearing on menus based on +This can be used to prevent a &tdm; server from appearing on menus based on <quote>Broadcast</quote> queries.</para> <para>An <quote>Indirect</quote> entry also contains a host name or pattern, @@ -424,7 +424,7 @@ the hop count is used as the TTL. --> If the indirect host list contains the keyword <literal>CHOOSER</literal>, <quote>Indirect</quote> queries are not forwarded, but instead a host chooser -dialog is displayed by &kdm;. The chooser will send a <quote>Direct</quote> +dialog is displayed by &tdm;. The chooser will send a <quote>Direct</quote> query to each of the remaining host names in the list and offer a menu of all the hosts that respond. The host list may contain the keyword <literal>BROADCAST</literal>, to make the chooser send a @@ -446,21 +446,21 @@ The formal syntax is <screen> <userinput> <literal>LISTEN</literal> [<replaceable>interface</replaceable> [<replaceable>multicast list</replaceable>]]</userinput> </screen> -If one or more <literal>LISTEN</literal> lines are specified, &kdm; listens +If one or more <literal>LISTEN</literal> lines are specified, &tdm; listens for &XDMCP; requests only on the specified interfaces. <replaceable>interface</replaceable> may be a hostname or IP address representing a network interface on this machine, or the wildcard <literal>*</literal> to represent all available network interfaces. If multicast group addresses are listed on a <literal>LISTEN</literal> line, -&kdm; joins the multicast groups on the given interface. For IPv6 multicasts, +&tdm; joins the multicast groups on the given interface. For IPv6 multicasts, the IANA has assigned ff0<replaceable>X</replaceable>:0:0:0:0:0:0:12b as the permanently assigned range of multicast addresses for &XDMCP;. The <replaceable>X</replaceable> in the prefix may be replaced by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and so on (see IETF RFC 2373 or its replacement for further details and scope -definitions). &kdm; defaults to listening on the Link-Local scope address +definitions). &tdm; defaults to listening on the Link-Local scope address ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. -If no <literal>LISTEN</literal> lines are given, &kdm; listens on all +If no <literal>LISTEN</literal> lines are given, &tdm; listens on all interfaces and joins the default &XDMCP; IPv6 multicast group (when compiled with IPv6 support). To disable listening for &XDMCP; requests altogether, a @@ -470,11 +470,11 @@ the <literal>[Xdmcp]</literal> <option>Enable</option> option is preferred. </sect1> -<sect1 id="kdm-scripts"> +<sect1 id="tdm-scripts"> <title>Supplementary programs</title> <para> -The following programs are run by &kdm; at various stages of a session. +The following programs are run by &tdm; at various stages of a session. They typically are shell scripts. </para> @@ -486,7 +486,7 @@ Their first argument is <literal>auto</literal> if the session results from an automatic login; otherwise, no arguments are passed to them. </para> -<sect2 id="kdmrc-xsetup"> +<sect2 id="tdmrc-xsetup"> <title>Setup program</title> <para> @@ -523,7 +523,7 @@ the following environment variables are passed:</para> </varlistentry> </variablelist> -<para> Note that since &kdm; grabs the keyboard, any other windows will not be +<para> Note that since &tdm; grabs the keyboard, any other windows will not be able to receive keyboard input. They will be able to interact with the mouse, however; beware of potential security holes here. If <option>GrabServer</option> is set, <filename>Xsetup</filename> will not be able to connect to the display @@ -533,7 +533,7 @@ at all. Resources for this program can be put into the file named by </sect2> -<sect2 id="kdmrc-xstartup"> +<sect2 id="tdmrc-xstartup"> <title>Startup program</title> <para>The <filename>Xstartup</filename> program is run as @@ -582,13 +582,13 @@ the following environment variables are passed:</para> </varlistentry> </variablelist> -<para>&kdm; waits until this program exits before starting the user session. -If the exit value of this program is non-zero, &kdm; discontinues the session +<para>&tdm; waits until this program exits before starting the user session. +If the exit value of this program is non-zero, &tdm; discontinues the session and starts another authentication cycle.</para> </sect2> -<sect2 id="kdmrc-xsession"> +<sect2 id="tdmrc-xsession"> <title>Session program</title> <para>The <filename>Xsession</filename> program is the command which is run @@ -662,7 +662,7 @@ the following environment variables are passed:</para> </sect2> -<sect2 id="kdmrc-xreset"> +<sect2 id="tdmrc-xreset"> <title>Reset program</title> <para>Symmetrical with <filename>Xstartup</filename>, the @@ -713,7 +713,7 @@ or unmounting directories from file servers.</para> # must be already quoted appropriately. The other types are auto-quoted. # If the default value is prefixed with a "*", a c #define def_<Key> is # created. -# The default is automatically appended to the kdmrc comment and the +# The default is automatically appended to the tdmrc comment and the # documentation entry. # CDefault: <verbose default> # Append this instead of the real default to the two docs. The quoting @@ -725,42 +725,42 @@ or unmounting directories from file servers.</para> # PostProc: <function> # A function to postprocess the read config value before using it. # User: (dummy|(core|greeter|greeter-c|dep|config)[(<variable>)][:font]) -# These entries specify which parts of kdm need the option in question: +# These entries specify which parts of tdm need the option in question: # dummy: no user; entry is there only for syntactical correctness. # dep: this option is an internal dependency for another option. # config: this option configures the config reader itself. -# core: the kdm backend needs this option. -# greeter-c: the kdm frontend needs this option as a C data type. -# greeter: the kdm frontend needs this option as a C++/Qt data type. +# core: the tdm backend needs this option. +# greeter-c: the tdm frontend needs this option as a C data type. +# greeter: the tdm frontend needs this option as a C++/Qt data type. # If a :font tag is appended, a string entry is converted to a QFont. # If no variable name is specified, it will be derived from the Key by # un-capitalizing it. # Instance: (-|[#][<display spec>/](!|<value>)) -# These entries specify option instances for the default/example kdmrc. +# These entries specify option instances for the default/example tdmrc. # A "-" entry is a dummy for syntactical correctness. -# A prefixing hash mark will be copied to kdmrc. +# A prefixing hash mark will be copied to tdmrc. # For options in a section class a display must be specified. # For bool options "!" can be used as the value to specify the negation # of the default. # Update: <function>[/<number>] -# Call this function on each occurence of this option in genkdmconf. +# Call this function on each occurence of this option in gentdmconf. # Options with higher numbers (default is 0) will be processed later. -# Merge: (xdm[:<resource>][(<function>)]|kdm:[<section>/][<key>][<function>]) -# Specify config options to merge from xdm and older kdm versions. +# Merge: (xdm[:<resource>][(<function>)]|tdm:[<section>/][<key>][<function>]) +# Specify config options to merge from xdm and older tdm versions. # Kdm options from the current version are automatically merged. # When merging an xdm resource and no resource name is specified, it is # derived from the Key by un-capitalizing it. -# When merging a kdm option, at least one of <section> and <key> must +# When merging a tdm option, at least one of <section> and <key> must # be given; an unspecified entity defaults to the current Section/Key. # <section> may be a dash-prefixed section class. # A function to postprocess the read value can be specified. # Comment: [&|-] -# A kdmrc comment for this option is expected in the next lines. +# A tdmrc comment for this option is expected in the next lines. # If "-" is given to Comment, no comment is generated at all. # If "&" is given, the comment is derived from the Description below by # applying some simple docbook interpretation to it. Note that the # Description must be preformatted in this case. Use -# sed -ne 's/^\(.\{79,\}\)$/\1/p' < kdmrc +# sed -ne 's/^\(.\{79,\}\)$/\1/p' < tdmrc # after running "make install" to see whether all lines still fit. # If Type is enum, a list of the previously defined element/description # pairs is appended; the descriptions undergo docbook interpretation. @@ -777,7 +777,7 @@ or unmounting directories from file servers.</para> # unless "DDefault: -" was specified. # Each option entry generates an anchor named option-<lowercase(Key)>; # it can be referenced in the main documentation. -# Do not forget to run "make ref" in tdebase/doc/kdm after changing +# Do not forget to run "make ref" in tdebase/doc/tdm after changing # Descriptions. Section: General @@ -797,12 +797,12 @@ Comment: Description: This option exists solely for the purpose of clean automatic upgrades. <emphasis>Do not</emphasis> change it, you may interfere with future - upgrades and this could result in &kdm; failing to run. + upgrades and this could result in &tdm; failing to run. Key: PAMService If: defined(USE_PAM) Type: string -Default: KDM_PAM_SERVICE +Default: TDM_PAM_SERVICE User: core Instance: - Comment: - @@ -810,8 +810,8 @@ Description: - <legacy> Proc: absorb_xservers -# note: this can miss Xservers from kdm for kde 2.2 because of stupid default. -Source: kdm:General/Xservers +# note: this can miss Xservers from tdm for kde 2.2 because of stupid default. +Source: tdm:General/Xservers Source: xdm:servers </legacy> @@ -824,12 +824,12 @@ Comment: List of permanent displays. Displays with a hostname are foreign. A display class may be specified separated by an underscore. Description: - List of displays (&X-Server;s) permanently managed by &kdm;. Displays with a + List of displays (&X-Server;s) permanently managed by &tdm;. Displays with a hostname are foreign displays which are expected to be already running, - the others are local displays for which &kdm; starts an own &X-Server;; + the others are local displays for which &tdm; starts an own &X-Server;; see <option>ServerCmd</option>. Each display may belong to a display class; append it to the display name separated by an underscore. - See <xref linkend="kdmrc-xservers"/> for the details. + See <xref linkend="tdmrc-xservers"/> for the details. Key: ReserveServers Type: list @@ -854,7 +854,7 @@ Comment: Description: List of Virtual Terminals to allocate to &X-Server;s. For negative numbers the absolute value is used, and the <acronym>VT</acronym> will be allocated only - if the kernel says it is free. If &kdm; exhausts this list, it will allocate + if the kernel says it is free. If &tdm; exhausts this list, it will allocate free <acronym>VT</acronym>s greater than the absolute value of the last entry in this list. Currently Linux only. @@ -870,26 +870,26 @@ Comment: TTYs (without /dev/) to monitor for activity while in console mode. Description: This option is for operating systems (<acronym>OS</acronym>s) with support - for virtual terminals (<acronym>VT</acronym>s), by both &kdm; and the + for virtual terminals (<acronym>VT</acronym>s), by both &tdm; and the <acronym>OS</acronym>s itself. Currently this applies only to Linux. </para><para> - When &kdm; switches to console mode, it starts monitoring all + When &tdm; switches to console mode, it starts monitoring all <acronym>TTY</acronym> lines listed here (without the leading <literal>/dev/</literal>). - If none of them is active for some time, &kdm; switches back to the X login. + If none of them is active for some time, &tdm; switches back to the X login. Key: PidFile Type: string Default: "" User: core -Instance: "/var/run/kdm.pid" +Instance: "/var/run/tdm.pid" Merge: xdm Comment: - Where &kdm; should store its PID (do not store if empty). + Where &tdm; should store its PID (do not store if empty). Description: The filename specified will be created to contain an ASCII representation - of the process ID of the main &kdm; process; the PID will not be stored + of the process ID of the main &tdm; process; the PID will not be stored if the filename is empty. Key: LockPidFile @@ -899,10 +899,10 @@ User: core Instance: #! Merge: xdm Comment: - Whether &kdm; should lock the PID file to prevent having multiple &kdm; + Whether &tdm; should lock the PID file to prevent having multiple &tdm; instances running at once. Do not change unless you are brave. Description: - This option controls whether &kdm; uses file locking to keep multiple + This option controls whether &tdm; uses file locking to keep multiple display managers from running onto each other. Key: AuthDir @@ -915,8 +915,8 @@ Merge: xdm(P_authDir) Comment: Where to store authorization files. Description: - This names a directory under which &kdm; stores &X-Server; authorization - files while initializing the session. &kdm; expects the system to clean up + This names a directory under which &tdm; stores &X-Server; authorization + files while initializing the session. &tdm; expects the system to clean up this directory from stale files on reboot. </para><para> The authorization file to be used for a particular display can be @@ -929,10 +929,10 @@ User: core Instance: #! Merge: xdm Comment: - Whether &kdm; should automatically re-read configuration files, if it + Whether &tdm; should automatically re-read configuration files, if it finds them having changed. Description: - This boolean controls whether &kdm; automatically re-reads its + This boolean controls whether &tdm; automatically re-reads its configuration files if it finds them to have changed. Key: ExportList @@ -943,7 +943,7 @@ Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_List) Comment: & Description: - Additional environment variables &kdm; should pass on to all programs it runs. + Additional environment variables &tdm; should pass on to all programs it runs. <envar>LD_LIBRARY_PATH</envar> and <envar>XCURSOR_THEME</envar> are good candidates; otherwise, it should not be necessary very often. @@ -955,12 +955,12 @@ User: core Instance: #"" Merge: xdm Comment: - A file &kdm; should read entropy from. + A file &tdm; should read entropy from. Description: If the system has no native entropy source like /dev/urandom (see <option>RandomDevice</option>) and no entropy daemon like EGD (see <option>PrngdSocket</option> and <option>PrngdPort</option>) is running, - &kdm; will fall back to its own pseudo-random number generator + &tdm; will fall back to its own pseudo-random number generator that will, among other things, successively checksum parts of this file (which, obviously, should change frequently). </para><para> @@ -975,7 +975,7 @@ User: core Instance: #"/tmp/entropy" Merge: xdm Comment: - A UNIX domain socket &kdm; should read entropy from. + A UNIX domain socket &tdm; should read entropy from. Description: If the system has no native entropy source like /dev/urandom (see <option>RandomDevice</option>), read random data from a Pseudo-Random @@ -992,7 +992,7 @@ User: core Instance: #4840 Merge: xdm Comment: - A TCP socket on localhost &kdm; should read entropy from. + A TCP socket on localhost &tdm; should read entropy from. Description: Same as <option>PrngdSocket</option>, only use a TCP socket on localhost. @@ -1004,10 +1004,10 @@ User: core Instance: #"/dev/altrandom" Merge: xdm Comment: - A character device &kdm; should read entropy from. + A character device &tdm; should read entropy from. Empty means use the system's preferred entropy device. Description: - The path to a character device which &kdm; should read random data from. + The path to a character device which &tdm; should read random data from. Empty means to use the system's preferred entropy device if there is one. </para><para> This option does not exist on OpenBSD, as it uses the arc4_random @@ -1025,7 +1025,7 @@ Comment: Description: The directory in which the command <acronym>FiFo</acronym>s should be created; make it empty to disable them. -# See <xref linkend="kdm-fifos"/> for the details. +# See <xref linkend="tdm-fifos"/> for the details. Key: FifoGroup Type: group @@ -1039,14 +1039,14 @@ Description: Key: DataDir Type: path -Default: *"/var/lib/kdm" +Default: *"/var/lib/tdm" User: greeter Instance: #"" Update: upd_datadir Comment: - The directory in which &kdm; should store persistent working data. + The directory in which &tdm; should store persistent working data. Description: - The directory in which &kdm; should store persistent working data; such data + The directory in which &tdm; should store persistent working data; such data is, for example, the previous user that logged in on a particular display. Key: DmrcDir @@ -1056,7 +1056,7 @@ User: core Instance: #"/nfs-shared/var/dmrcs" Comment: & Description: - The directory in which &kdm; should store users' <filename>.dmrc</filename> files. This is only + The directory in which &tdm; should store users' <filename>.dmrc</filename> files. This is only needed if the home directories are not readable before actually logging in (like with AFS). @@ -1064,9 +1064,9 @@ Description: Section: Xdmcp If: defined(XDMCP) Description: - This section contains options that control &kdm;'s handling of + This section contains options that control &tdm;'s handling of &XDMCP; requests. -# See <xref linkend="xdmcp-with-kdm"/> to find out what &XDMCP; is. +# See <xref linkend="xdmcp-with-tdm"/> to find out what &XDMCP; is. Key: Enable Type: bool @@ -1075,7 +1075,7 @@ User: dep(xdmcpEnable) Instance: false Comment: & Description: - Whether &kdm; should listen to incoming &XDMCP; requests. + Whether &tdm; should listen to incoming &XDMCP; requests. Key: Port Type: int @@ -1085,9 +1085,9 @@ User: core(request_port) Instance: # Merge: xdm:requestPort(P_requestPort) Comment: - The UDP port on which &kdm; should listen for &XDMCP; requests. Do not change. + The UDP port on which &tdm; should listen for &XDMCP; requests. Do not change. Description: - This indicates the UDP port number which &kdm; uses to listen for incoming + This indicates the UDP port number which &tdm; uses to listen for incoming &XDMCP; requests. Unless you need to debug the system, leave this with its default value. @@ -1095,21 +1095,21 @@ Key: KeyFile Type: string Default: "" User: core -Instance: #KDMCONF "/kdmkeys" +Instance: #TDMCONF "/tdmkeys" Update: cp_keyfile Merge: xdm Comment: File with the private keys of X-terminals. Required for XDM authentication. Description: XDM-AUTHENTICATION-1 style &XDMCP; authentication requires a private - key to be shared between &kdm; and the terminal. This option specifies + key to be shared between &tdm; and the terminal. This option specifies the file containing those values. Each entry in the file consists of a display name and the shared key. Key: Xaccess Type: string # differs from xdm -Default: *KDMCONF "/Xaccess" +Default: *TDMCONF "/Xaccess" User: config(Xaccess) Instance: #"" Update: mk_xaccess @@ -1121,7 +1121,7 @@ Description: IndirectQuery requests, this file contains a database of hostnames which are either allowed direct access to this machine, or have a list of hosts to which queries should be forwarded to. The format of this file is - described in <xref linkend="kdmrc-xaccess"/>. + described in <xref linkend="tdmrc-xaccess"/>. Key: ChoiceTimeout Type: int @@ -1151,7 +1151,7 @@ Comment: Description: When computing the display name for &XDMCP; clients, the name resolver will typically create a fully qualified host name for the terminal. As this is - sometimes confusing, &kdm; will remove the domain name portion of the host + sometimes confusing, &tdm; will remove the domain name portion of the host name if it is the same as the domain name of the local host when this option is enabled. @@ -1177,7 +1177,7 @@ User: core Instance: # Update: mk_willing Merge: xdm -Merge: kdm:Xwilling +Merge: tdm:Xwilling Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. @@ -1206,7 +1206,7 @@ Comment: Description: The command (subject to word splitting) to run to halt/poweroff the system. </para><para> - The default is something reasonable for the system on which &kdm; was built, like + The default is something reasonable for the system on which &tdm; was built, like <command>/sbin/shutdown <option>-h</option> <parameter>now</parameter></command>. Key: RebootCmd @@ -1220,7 +1220,7 @@ Comment: Description: The command (subject to word splitting) to run to reboot the system. </para><para> - The default is something reasonable for the system &kdm; on which was built, like + The default is something reasonable for the system &tdm; on which was built, like <command>/sbin/shutdown <option>-r</option> <parameter>now</parameter></command>. Key: AllowFifo @@ -1255,17 +1255,17 @@ Default: None User: core User: greeter Instance: #Grub -Merge: kdm:UseLilo(P_UseLilo) +Merge: tdm:UseLilo(P_UseLilo) Comment: & Description: - The boot manager &kdm; should use for offering boot options in the + The boot manager &tdm; should use for offering boot options in the shutdown dialog. Section: -Core Description: This section class contains options concerning the configuration - of the &kdm; backend (core). + of the &tdm; backend (core). Key: OpenDelay Type: int @@ -1299,7 +1299,7 @@ Comment: How many connection attempts to make during a start attempt. Note that a timeout aborts the entire start attempt. Description: - These options control the behavior of &kdm; when attempting to open a + These options control the behavior of &tdm; when attempting to open a connection to an &X-Server;. <option>OpenDelay</option> is the length of the pause (in seconds) between successive attempts, <option>OpenRepeat</option> is the number of attempts to make and @@ -1318,7 +1318,7 @@ Comment: Try at most that many times to start a display. If this fails, the display is disabled. Description: - How many times &kdm; should attempt to start a <literal>foreign</literal> + How many times &tdm; should attempt to start a <literal>foreign</literal> display listed in <option>StaticServers</option> before giving up and disabling it. Local displays are attempted only once, and &XDMCP; displays are retried @@ -1335,7 +1335,7 @@ Comment: How often to try to run the &X-Server;. Running includes executing it and waiting for it to come up. Description: - How many times &kdm; should attempt to start up a local &X-Server;. + How many times &tdm; should attempt to start up a local &X-Server;. Starting up includes executing it and waiting for it to come up. Key: ServerTimeout @@ -1346,7 +1346,7 @@ Instance: #:*/ Comment: How long to wait for a local &X-Server; to come up. Description: - How many seconds &kdm; should wait for a local &X-Server; to come up. + How many seconds &tdm; should wait for a local &X-Server; to come up. Key: ServerCmd Type: string @@ -1361,7 +1361,7 @@ Description: The command line to start the &X-Server;, without display number and VT spec. This string is subject to word splitting. </para><para> - The default is something reasonable for the system on which &kdm; was built, + The default is something reasonable for the system on which &tdm; was built, like <command>/usr/bin/X</command>. Key: ServerArgsLocal @@ -1396,7 +1396,7 @@ Comment: Description: The VT the &X-Server; should run on. <option>ServerVTs</option> should be used instead of this option. - Leave it zero to let &kdm; assign a <acronym>VT</acronym> automatically. + Leave it zero to let &tdm; assign a <acronym>VT</acronym> automatically. Set it to <literal>-1</literal> to avoid assigning a <acronym>VT</acronym> alltogether - this is required for setups with multiple physical consoles. Currently Linux only. @@ -1411,13 +1411,13 @@ Comment: The TTY line (without /dev/) the &X-Server; covers physically. Description: This option is for <acronym>OS</acronym>s without support for - <acronym>VT</acronym>s, either by &kdm; or the <acronym>OS</acronym> itself. + <acronym>VT</acronym>s, either by &tdm; or the <acronym>OS</acronym> itself. Currently this applies to all <acronym>OS</acronym>s but Linux. </para><para> - When &kdm; switches to console mode, it starts monitoring this + When &tdm; switches to console mode, it starts monitoring this <acronym>TTY</acronym> line (specified without the leading <literal>/dev/</literal>) for activity. If the line is not used for some time, - &kdm; switches back to the X login. + &tdm; switches back to the X login. Key: PingInterval Type: int @@ -1441,7 +1441,7 @@ Merge: xdm Comment: Wait for a Pong that many minutes. Description: - To discover when <emphasis>remote</emphasis> displays disappear, &kdm; + To discover when <emphasis>remote</emphasis> displays disappear, &tdm; regularly pings them. <option>PingInterval</option> specifies the time (in minutes) between the pings and <option>PingTimeout</option> specifies the maximum amount of @@ -1463,7 +1463,7 @@ Comment: Restart instead of resetting the local &X-Server; after session exit. Use it if the server leaks memory etc. Description: - Whether &kdm; should restart the local &X-Server; after session exit instead + Whether &tdm; should restart the local &X-Server; after session exit instead of resetting it. Use this if the &X-Server; leaks memory or crashes the system on reset attempts. @@ -1500,7 +1500,7 @@ Merge: xdm Comment: Create X-authorizations for local displays. Description: - Controls whether &kdm; generates and uses authorization for + Controls whether &tdm; generates and uses authorization for <emphasis>local</emphasis> &X-Server; connections. For &XDMCP; displays the authorization requested by the display is used; foreign non-&XDMCP; displays do not support authorization at all. @@ -1530,9 +1530,9 @@ Comment: Description: Some <emphasis>old</emphasis> &X-Server;s re-read the authorization file at &X-Server; reset time, instead of when checking the initial connection. - As &kdm; generates the authorization information just before connecting to + As &tdm; generates the authorization information just before connecting to the display, an old &X-Server; would not get up-to-date authorization - information. This option causes &kdm; to send SIGHUP to the &X-Server; + information. This option causes &tdm; to send SIGHUP to the &X-Server; after setting up the file, causing an additional &X-Server; reset to occur, during which time the new authorization information will be read. @@ -1546,7 +1546,7 @@ Comment: The name of this &X-Server;'s Xauth file. If empty, a random name in the AuthDir directory will be used. Description: - This file is used to communicate the authorization data from &kdm; to + This file is used to communicate the authorization data from &tdm; to the &X-Server;, using the <option>-auth</option> &X-Server; command line option. It should be kept in a directory which is not world-writable as it could easily be removed, disabling the authorization mechanism in @@ -1605,7 +1605,7 @@ Description: around the greeter window or to put up other windows (e.g., you may want to run <command>xconsole</command> here). The conventional name for a file used here is <command>Xsetup</command>. - See <xref linkend="kdmrc-xsetup"/>. + See <xref linkend="tdmrc-xsetup"/>. Key: Startup Type: string @@ -1623,7 +1623,7 @@ Description: <systemitem class="username">root</systemitem>) after the user authentication process succeeds. The conventional name for a file used here is <command>Xstartup</command>. - See <xref linkend="kdmrc-xstartup"/>. + See <xref linkend="tdmrc-xstartup"/>. Key: Reset Type: string @@ -1641,7 +1641,7 @@ Description: <systemitem class="username">root</systemitem>) after the session terminates. The conventional name for a file used here is <command>Xreset</command>. - See <xref linkend="kdmrc-xreset"/>. + See <xref linkend="tdmrc-xreset"/>. Key: Session Type: string @@ -1660,7 +1660,7 @@ Description: It specifies the session program to be executed (as the user owning the session). The conventional name for a file used here is <command>Xsession</command>. - See <xref linkend="kdmrc-xsession"/>. + See <xref linkend="tdmrc-xsession"/>. Key: FailsafeClient Type: string @@ -1671,10 +1671,10 @@ Merge: xdm Comment: The program to run if Session fails. Description: - If the <option>Session</option> program fails to execute, &kdm; will + If the <option>Session</option> program fails to execute, &tdm; will fall back to this program. This program is executed with no arguments, but executes using the same environment variables as the session would - have had (see <xref linkend="kdmrc-xsession"/>). + have had (see <xref linkend="tdmrc-xsession"/>). Key: UserPath Type: string @@ -1689,7 +1689,7 @@ Description: The <envar>PATH</envar> environment variable for non-<systemitem class="username">root</systemitem> <option>Session</option>s. </para><para> - The default depends on the system &kdm; was built on. + The default depends on the system &tdm; was built on. Key: SystemPath Type: string @@ -1706,7 +1706,7 @@ Description: <option>Session</option>s. Note that it is good practice not to include <literal>.</literal> (the current directory) into this entry. </para><para> - The default depends on the system &kdm; was built on. + The default depends on the system &tdm; was built on. Key: SystemShell Type: string @@ -1730,7 +1730,7 @@ Comment: Where to put the user's &X-Server; authorization file if ~/.Xauthority cannot be created. Description: - When &kdm; is unable to write to the usual user authorization file + When &tdm; is unable to write to the usual user authorization file ($<envar>HOME</envar>/.Xauthority), it creates a unique file name in this directory and points the environment variable <envar>XAUTHORITY</envar> at the created file. @@ -1746,7 +1746,7 @@ Comment: Note that enabling this makes circumventing screen lockers other than KDE's built-in one possible! Description: - If enabled, &kdm; will automatically restart a session after an &X-Server; + If enabled, &tdm; will automatically restart a session after an &X-Server; crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this feature opens a security hole: a secured display lock can be circumvented (unless &kde;'s built-in screen locker is used). @@ -1787,7 +1787,7 @@ User: core User: greeter Instance: */Root Instance: :*/All -Merge: kdm:-Greeter/ +Merge: tdm:-Greeter/ Comment: & Description: Who is allowed to shut down the system. This applies both to the @@ -1914,7 +1914,7 @@ Comment: & Description: The password for the user to log in automatically. This is <emphasis>not</emphasis> required unless the user is logged into a <acronym>NIS</acronym> or Kerberos domain. If you use this - option, you should <command>chmod <option>600</option> <filename>kdmrc</filename></command> for obvious reasons. + option, you should <command>chmod <option>600</option> <filename>tdmrc</filename></command> for obvious reasons. Key: AutoLoginLocked Type: bool @@ -1928,15 +1928,15 @@ Description: Key: SessionsDirs Type: list -Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" +Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions" User: core User: greeter-c -Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" +Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions" Comment: The directories containing session type definitions in .desktop format. Description: A list of directories containing session type definitions. -# See <xref linkend="kdmrc-sessions"> for details. +# See <xref linkend="tdmrc-sessions"> for details. Key: ClientLogFile Type: string @@ -1959,9 +1959,9 @@ Default: false User: core Instance: #*/! Comment: - Whether &kdm;'s built-in utmp/wtmp/lastlog registration should be used. + Whether &tdm;'s built-in utmp/wtmp/lastlog registration should be used. Description: - Specify whether &kdm;'s built-in utmp/wtmp/lastlog registration should + Specify whether &tdm;'s built-in utmp/wtmp/lastlog registration should be used. If it is not, the tool <command>sessreg</command> should be used in the <option>Startup</option> and <option>Reset</option> scripts, or, alternatively, the pam_lastlog module should be used on @@ -1971,7 +1971,7 @@ Description: Section: -Greeter Description: This section class contains options concerning the configuration - of the &kdm; frontend (greeter). + of the &tdm; frontend (greeter). Key: GUIStyle Type: string @@ -2059,7 +2059,7 @@ Key: LogoPixmap Type: string Default: "" User: greeter(logo) -Instance: */KDMDATA "/pics/kdelogo.png" +Instance: */TDMDATA "/pics/kdelogo.png" Comment: The image to show when LogoArea=Logo. Description: @@ -2075,7 +2075,7 @@ Comment: The relative coordinates (X,Y in percent) of the center of the greeter. Description: The relative coordinates (percentages of the screen size; X,Y) at which - the center of the greeter is put. &kdm; aligns the greeter to the edges + the center of the greeter is put. &tdm; aligns the greeter to the edges of the screen it would cross otherwise. Key: GreeterScreen @@ -2254,7 +2254,7 @@ Type: list Default: "" User: greeter-c(users) Instance: #*/"root,johndoe" -Merge: kdm:Users +Merge: tdm:Users Comment: For ShowUsers=Selected. @<group> means all users in that group. Description: @@ -2267,7 +2267,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID Update: upd_hiddenusers/1 -Merge: kdm:NoUsers +Merge: tdm:NoUsers Comment: For ShowUsers=NotHidden. @<group> means all users in that group. Description: @@ -2322,13 +2322,13 @@ Instance: #*/PreferUser Comment: Specify, where the users' pictures should be taken from. Description: - If <option>UserList</option> is enabled, this specifies where &kdm; gets the + If <option>UserList</option> is enabled, this specifies where &tdm; gets the images from: </para> %ENUM% <para> The images can be in any format Qt recognizes, but the filename - must match &kdm;'s expectations: <literal>.face.icon</literal> should be a + must match &tdm;'s expectations: <literal>.face.icon</literal> should be a 48x48 icon, while <literal>.face</literal> should be a 300x300 image. Currently the big image is used only as a fallback and is scaled down, but in the future it might be displayed full-size in the logo area or a @@ -2336,7 +2336,7 @@ Description: Key: FaceDir Type: string -Default: *KDMDATA "/faces" +Default: *TDMDATA "/faces" User: greeter Instance: #*/"/usr/share/faces" Update: upd_facedir @@ -2412,16 +2412,16 @@ Default: true User: greeter Instance: #*/! Comment: - If true, krootimage will be automatically started by &kdm;; otherwise, the + If true, krootimage will be automatically started by &tdm;; otherwise, the Setup script should be used to setup the background. Description: - If enabled, &kdm; will automatically start the <command>krootimage</command> + If enabled, &tdm; will automatically start the <command>krootimage</command> program to set up the background; otherwise, the <option>Setup</option> program is responsible for the background. Key: BackgroundCfg Type: string -Default: *KDMCONF "/backgroundrc" +Default: *TDMCONF "/backgroundrc" User: greeter-c Instance: #*/"" Update: handBgCfg @@ -2461,11 +2461,11 @@ Instance: #*/ Comment: How many seconds to wait for grab to succeed. Description: - This option specifies the maximum time &kdm; will wait for the grabs to + This option specifies the maximum time &tdm; will wait for the grabs to succeed. A grab may fail if some other X-client has the &X-Server; or the keyboard grabbed, or possibly if the network latencies are very high. You should be cautious when raising the timeout, as a user can be spoofed by - a look-alike window on the display. If a grab fails, &kdm; kills and + a look-alike window on the display. If a grab fails, &tdm; kills and restarts the &X-Server; (if possible) and the session. Key: AuthComplain @@ -2504,7 +2504,7 @@ User: core User: greeter Instance: :*/DefaultLocal # from make_it_cool branch and SuSE 8.1 -Merge: kdm:EnableChooser(P_EnableChooser) +Merge: tdm:EnableChooser(P_EnableChooser) Comment: & Description: Specify whether the greeter of local displays should start up in host chooser @@ -2540,31 +2540,31 @@ Description: login domain. Key: ShowLog -If: defined(WITH_KDM_XCONSOLE) +If: defined(WITH_TDM_XCONSOLE) Type: bool Default: false User: greeter Instance: :0/true Comment: - Enable &kdm;'s built-in xconsole. Note that this can be enabled for only + Enable &tdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. Description: - Enable &kdm;'s built-in <command>xconsole</command>. + Enable &tdm;'s built-in <command>xconsole</command>. Note that this can be enabled for only one display at a time. - This option is available only if &kdm; was <command>configure</command>d - with <option>--enable-kdm-xconsole</option>. + This option is available only if &tdm; was <command>configure</command>d + with <option>--enable-tdm-xconsole</option>. Key: LogSource -If: defined(WITH_KDM_XCONSOLE) +If: defined(WITH_TDM_XCONSOLE) Type: string Default: "" User: greeter-c Instance: :0/"/dev/xconsole" Comment: - The data source for &kdm;'s built-in xconsole. + The data source for &tdm;'s built-in xconsole. If empty, a console log redirection is requested from /dev/console. Description: - The data source for &kdm;'s built-in <command>xconsole</command>. + The data source for &tdm;'s built-in <command>xconsole</command>. If empty, a console log redirection is requested from <filename>/dev/console</filename>. Has no effect if <option>ShowLog</option> is disabled. @@ -2653,9 +2653,9 @@ Description: Key: Theme Type: string -Default: KDMDATA "/themes/o2_enterprise" +Default: TDMDATA "/themes/o2_enterprise" User: greeter -Instance: */KDMDATA "/themes/o2_enterprise" +Instance: */TDMDATA "/themes/o2_enterprise" Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML diff --git a/kdm/configure.in.bot b/kdm/configure.in.bot index 838d29faa..a0d238b29 100644 --- a/kdm/configure.in.bot +++ b/kdm/configure.in.bot @@ -1,8 +1,8 @@ -if $kdm_no_Xau; then - AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!]) +if $tdm_no_Xau; then + AC_MSG_WARN([Cannot build TDM! Make sure that libXau.a is installed!]) fi -if $kdm_no_Xdmcp; then - AC_MSG_WARN([Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h +if $tdm_no_Xdmcp; then + AC_MSG_WARN([Cannot build TDM! Make sure that libXdmcp.a and Xdmcp.h are installed or use --without-xdmcp to disable XDMCP support!]) fi diff --git a/kdm/configure.in.in b/kdm/configure.in.in index 6ce44068c..5422e5a99 100644 --- a/kdm/configure.in.in +++ b/kdm/configure.in.in @@ -80,20 +80,20 @@ done ]) AC_CHECK_FUNC(vsyslog, [ - AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])]) + AC_DEFINE(USE_SYSLOG, 1, [Define if tdm should be built with syslog support])]) -kdm_no_Xau=false -kdm_no_Xdmcp=false +tdm_no_Xau=false +tdm_no_Xdmcp=false AC_CHECK_LIB(Xau, main, [:], [ - kdm_no_Xau=true - DO_NOT_COMPILE="$DO_NOT_COMPILE kdm" + tdm_no_Xau=true + DO_NOT_COMPILE="$DO_NOT_COMPILE tdm" ], $X_LDFLAGS -lX11 $LIBSOCKET) AC_ARG_WITH(xdmcp, - AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), , + AC_HELP_STRING([--without-xdmcp],[build tdm without xdmcp support [default=with xdmcp]]), , [with_xdmcp=yes]) if test "x$with_xdmcp" = xyes; then AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET) @@ -104,14 +104,14 @@ if test "x$with_xdmcp" = xyes; then CPPFLAGS=$cppflags_safe fi if test -z "$HAVE_X11_XDMCP_H"; then - kdm_no_Xdmcp=true - DO_NOT_COMPILE="$DO_NOT_COMPILE kdm" + tdm_no_Xdmcp=true + DO_NOT_COMPILE="$DO_NOT_COMPILE tdm" fi - AC_DEFINE(XDMCP, 1, [Define if kdm should be built with XDMCP support]) + AC_DEFINE(XDMCP, 1, [Define if tdm should be built with XDMCP support]) ac_save_libs=$LIBS LIBS="$LIBS $LIBXDMCP" AC_CHECK_FUNC(XdmcpWrap, [ - AC_DEFINE(HASXDMAUTH, 1, [Define if kdm should be built with XDMAUTH support]) + AC_DEFINE(HASXDMAUTH, 1, [Define if tdm should be built with XDMAUTH support]) ]) LIBS=$ac_save_libs fi @@ -178,9 +178,9 @@ KRB5_INCS= KRB5_LIBS= KRB5_RPATH= -AC_MSG_CHECKING([whether to use Kerberos5 for Xauth cookies in kdm]) +AC_MSG_CHECKING([whether to use Kerberos5 for Xauth cookies in tdm]) AC_ARG_WITH(krb5auth, - AC_HELP_STRING([--with-krb5auth=PATH],[Use Kerberos5 for Xauth cookies in kdm]), , + AC_HELP_STRING([--with-krb5auth=PATH],[Use Kerberos5 for Xauth cookies in tdm]), , [ with_krb5auth=no ]) if test "x$with_krb5auth" = xno; then AC_MSG_RESULT(no) @@ -197,7 +197,7 @@ else keepcflags=$CFLAGS CFLAGS="$KRB5_INCS $CFLAGS" AC_CHECK_HEADER(krb5/krb5.h, - [ AC_DEFINE(K5AUTH, 1, [Define if kdm should use Kerberos 5 for Xauth cookies.]) ], + [ AC_DEFINE(K5AUTH, 1, [Define if tdm should use Kerberos 5 for Xauth cookies.]) ], [ AC_MSG_ERROR([--with-krb5auth requires Kerberos5 header files. Due to a problem with X includes you probably have to run "ln -s . krb5" in the directory where the krb5.h include resides to make things actually work.])]) @@ -208,36 +208,36 @@ AC_SUBST(KRB5_INCS) AC_SUBST(KRB5_LIBS) AC_SUBST(KRB5_RPATH) -AC_MSG_CHECKING([whether to use Sun's secure RPC for Xauth cookies in kdm]) +AC_MSG_CHECKING([whether to use Sun's secure RPC for Xauth cookies in tdm]) AC_ARG_WITH(rpcauth, - AC_HELP_STRING([--with-rpcauth],[Use Sun's secure RPC for Xauth cookies in kdm.]), , + AC_HELP_STRING([--with-rpcauth],[Use Sun's secure RPC for Xauth cookies in tdm.]), , [ with_rpcauth=no ]) if test "x$with_rpcauth" = xno; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) AC_CHECK_HEADER(rpc/rpc.h, - [ AC_DEFINE(SECURE_RPC, 1, [Define if kdm should use Sun's secure RPC for Xauth cookies.]) ], + [ AC_DEFINE(SECURE_RPC, 1, [Define if tdm should use Sun's secure RPC for Xauth cookies.]) ], [ AC_MSG_ERROR([--with-rpcauth requires Sun RPC header files.])]) fi if test "x$use_pam" = xyes; then - AC_DEFINE(USE_PAM, 1, [Define if kdm should use PAM]) + AC_DEFINE(USE_PAM, 1, [Define if tdm should use PAM]) elif test "x$use_shadow" = xyes; then - AC_DEFINE(USESHADOW, 1, [Define if kdm should use shadow passwords]) + AC_DEFINE(USESHADOW, 1, [Define if tdm should use shadow passwords]) fi if test "x$with_krb4" != xno; then - AC_DEFINE(KERBEROS, 1, [Define if kdm should use Kerberos IV]) + AC_DEFINE(KERBEROS, 1, [Define if tdm should use Kerberos IV]) if test "x$with_afs" = xno; then - AC_DEFINE(NO_AFS, 1, [Define if kdm should not use AFS]) + AC_DEFINE(NO_AFS, 1, [Define if tdm should not use AFS]) fi fi -AC_ARG_WITH(kdm-xconsole, - AC_HELP_STRING([--with-kdm-xconsole],[build kdm with built-in xconsole [default=no]]), , - [with_kdm_xconsole=no]) -if test "x$with_kdm_xconsole" = xyes; then - AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole]) +AC_ARG_WITH(tdm-xconsole, + AC_HELP_STRING([--with-tdm-xconsole],[build tdm with built-in xconsole [default=no]]), , + [with_tdm_xconsole=no]) +if test "x$with_tdm_xconsole" = xyes; then + AC_DEFINE(WITH_TDM_XCONSOLE, 1, [Build tdm with built-in xconsole]) fi ########### Check for DBus @@ -334,7 +334,7 @@ fi AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_LIBS) -dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop) +dnl AC_OUTPUT(tdm/kfrontend/sessions/kde.desktop) AC_ARG_WITH(libaudit, diff --git a/kdm/confproc.pl b/kdm/confproc.pl index 0ce0c1ae0..c187c88c0 100755 --- a/kdm/confproc.pl +++ b/kdm/confproc.pl @@ -66,7 +66,7 @@ sub dedb($) $t =~ s, , ,g; $t =~ s,<,<,g; $t =~ s,>,>,g; - $t =~ s,&kdm;,KDM,g; + $t =~ s,&tdm;,TDM,g; $t =~ s,&XDMCP;,XDMCP,g; $t =~ s,&X-Server;,X-server,g; return $t; @@ -241,10 +241,10 @@ while (<INFILE>) { last if (/^<\/code>\n$/); $raw_out .= $_; } - } elsif (/^<kdmrc>$/) { + } elsif (/^<tdmrc>$/) { my $comm = ""; while (<INFILE>) { - last if (/^<\/kdmrc>\n$/); + last if (/^<\/tdmrc>\n$/); chop; if (/^\[(.*)\]$/) { defined($ex_sects{$1}) && @@ -294,7 +294,7 @@ while (<INFILE>) { my @oa = ([ "{ \"".$what."\", (char *)-1, 0, ".$proc." },", "XMO" ]); add_cond($kif, $what, \@oa, \%ov_xm_conds); $ov_xm[$dsp] .= $oa[0][0]." \\\n"; - } elsif ($src =~ /^kdm:(.*)\/(.*)$/) { + } elsif ($src =~ /^tdm:(.*)\/(.*)$/) { my ($sec, $key) = ($1, $2); my @oa = ([ "{ \"".$key."\", (char *)-1, 0, ".$proc." },", "KMO".($mcnt++) ]); add_cond($kif, $key, \@oa, \%ov_km_conds); @@ -528,7 +528,7 @@ while (<INFILE>) { ); add_cond($kif, $key, \@oa, \%ov_xm_conds); $ov_xm[$sect =~ /^-/] .= $oa[0][0]." \\\n"; - } elsif ($merge =~ /^kdm:([^\(]+)(\((.+)\))?$/) { + } elsif ($merge =~ /^tdm:([^\(]+)(\((.+)\))?$/) { my ($where, $func) = ($1, $3); my $sec = ""; ($where =~ s/^([^\/]+)\///) && ($sec = $1); @@ -594,8 +594,8 @@ while (<INFILE>) { $doc_ref .= "<para>Empty by default.</para>\n"; } else { $ddflt =~ s/\"//g; - $ddflt =~ s,KDMCONF ,\${<envar>kde_confdir</envar>}/kdm,; - $ddflt =~ s,KDMDATA ,\${<envar>kde_datadir</envar>}/kdm,; + $ddflt =~ s,TDMCONF ,\${<envar>kde_confdir</envar>}/tdm,; + $ddflt =~ s,TDMDATA ,\${<envar>kde_datadir</envar>}/tdm,; $ddflt =~ s,XBINDIR ,\${<envar>x_bindir</envar>},; $doc_ref .= "<para>The default is <quote>".$ddflt."</quote>.</para>\n"; } @@ -654,8 +654,8 @@ while (<INFILE>) { $sna = "section"; } $doc_ref .= - "\n<sect2 id=\"kdmrc-".$sref."\">\n". - "<title>The [".$stit."] ".$sna." of &kdmrc;</title>\n\n"; + "\n<sect2 id=\"tdmrc-".$sref."\">\n". + "<title>The [".$stit."] ".$sna." of &tdmrc;</title>\n\n"; if (/^Description:(( -)?)$/) { if ($1 ne " -") { my $desc = 0; diff --git a/kdm/kfrontend/CMakeLists.txt b/kdm/kfrontend/CMakeLists.txt index cd432af4b..4a069a3ae 100644 --- a/kdm/kfrontend/CMakeLists.txt +++ b/kdm/kfrontend/CMakeLists.txt @@ -17,8 +17,8 @@ add_subdirectory( sessions ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdm/backend - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdm/backend + ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/kcontrol/background ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -31,43 +31,43 @@ link_directories( ##### other data ################################ -if( NOT DEFINED GENKDMCONF_FLAGS ) - set( GENKDMCONF_FLAGS "--no-old" ) +if( NOT DEFINED GENTDMCONF_FLAGS ) + set( GENTDMCONF_FLAGS "--no-old" ) endif( ) -install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" ) +install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/tdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENTDMCONF_FLAGS} )" ) ##### config.ci (generated) ##################### add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def ) -##### kdm_config (executable) ################### +##### tdm_config (executable) ################### -set_property( SOURCE kdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) +set_property( SOURCE tdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) -tde_add_executable( kdm_config - SOURCES kdm_config.c +tde_add_executable( tdm_config + SOURCES tdm_config.c LINK DESTINATION ${BIN_INSTALL_DIR} ) -##### kdm_greet (executable) #################### +##### tdm_greet (executable) #################### if( WITH_XRANDR ) - set( KDMGREET_OPTIONAL_LINK "krandr-shared" ) + set( TDMGREET_OPTIONAL_LINK "krandr-shared" ) endif ( ) -tde_add_executable( kdm_greet AUTOMOC +tde_add_executable( tdm_greet AUTOMOC SOURCES - kdm_greet.c kdmconfig.cpp kdmclock.cpp kconsole.cpp + tdm_greet.c tdmconfig.cpp tdmclock.cpp kconsole.cpp kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp - kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp + tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp kgapp.cpp sakdlg.cc - LINK kdmthemer-static tdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK} + LINK tdmthemer-static tdeui-shared Xtst ${TDMGREET_OPTIONAL_LINK} DESTINATION ${BIN_INSTALL_DIR} ) @@ -81,21 +81,21 @@ tde_add_executable( krootimage AUTOMOC ) -##### genkdmconf (executable) ################### +##### gentdmconf (executable) ################### -set_property( SOURCE genkdmconf.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) +set_property( SOURCE gentdmconf.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) -tde_add_executable( genkdmconf AUTOMOC - SOURCES genkdmconf.c +tde_add_executable( gentdmconf AUTOMOC + SOURCES gentdmconf.c LINK X11 DESTINATION ${BIN_INSTALL_DIR} ) -##### kdmctl (executable) ####################### +##### tdmctl (executable) ####################### -tde_add_executable( kdmctl - SOURCES kdmctl.c +tde_add_executable( tdmctl + SOURCES tdmctl.c LINK DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdm/kfrontend/Makefile.am b/kdm/kfrontend/Makefile.am index 889271292..7c58dc67f 100644 --- a/kdm/kfrontend/Makefile.am +++ b/kdm/kfrontend/Makefile.am @@ -1,31 +1,31 @@ -# use 'make GENKDMCONF_FLAGS=... install' to override -GENKDMCONF_FLAGS = --no-old +# use 'make GENTDMCONF_FLAGS=... install' to override +GENTDMCONF_FLAGS = --no-old SUBDIRS = themer themes pics sessions AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \ - -I$(top_srcdir)/kdmlib $(all_includes) + -I$(top_srcdir)/tdmlib $(all_includes) -bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl +bin_PROGRAMS = tdm_config tdm_greet krootimage gentdmconf tdmctl -kdm_config_SOURCES = kdm_config.c -kdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4) +tdm_config_SOURCES = tdm_config.c +tdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4) -kdm_greet_SOURCES = \ - kdm_greet.c \ - kdmconfig.cpp \ - kdmclock.cpp \ +tdm_greet_SOURCES = \ + tdm_greet.c \ + tdmconfig.cpp \ + tdmclock.cpp \ kconsole.cpp \ kfdialog.cpp \ kgdialog.cpp \ kchooser.cpp \ kgverify.cpp \ - kdmshutdown.cpp \ - kdmadmindialog.cpp \ + tdmshutdown.cpp \ + tdmadmindialog.cpp \ kgreeter.cpp \ kgapp.cpp -kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) +tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) krootimage_SOURCES = krootimage.cpp krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor @@ -33,35 +33,35 @@ krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) METASOURCES = AUTO -genkdmconf_SOURCES = genkdmconf.c -genkdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH) -genkdmconf_LDADD = $(LIB_X11) +gentdmconf_SOURCES = gentdmconf.c +gentdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH) +gentdmconf_LDADD = $(LIB_X11) -kdmctl_SOURCES = kdmctl.c -kdmctl_LDADD = $(LIBSOCKET) +tdmctl_SOURCES = tdmctl.c +tdmctl_LDADD = $(LIBSOCKET) -install-data-local: genkdmconf - ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +install-data-local: gentdmconf + ./gentdmconf --in $(DESTDIR)$(kde_confdir)/tdm --no-in-notice --face-src $(srcdir)/pics $(GENTDMCONF_FLAGS) messages: - $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/tdmgreet.pot noinst_HEADERS = \ - kdm_greet.h \ - kdmconfig.h \ - kdmclock.h \ + tdm_greet.h \ + tdmconfig.h \ + tdmclock.h \ kconsole.h \ kfdialog.h \ kgdialog.h \ kchooser.h \ kgverify.h \ - kdmshutdown.h \ + tdmshutdown.h \ kgreeter.h \ kgapp.h \ \ krootimage.h -kdm_greet_COMPILE_FIRST = ../config.ci -kdm_config_COMPILE_FIRST = ../config.ci -genkdmconf_COMPILE_FIRST = ../config.ci +tdm_greet_COMPILE_FIRST = ../config.ci +tdm_config_COMPILE_FIRST = ../config.ci +gentdmconf_COMPILE_FIRST = ../config.ci diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c index bfbeda32a..f55ffbbbc 100644 --- a/kdm/kfrontend/genkdmconf.c +++ b/kdm/kfrontend/genkdmconf.c @@ -1,6 +1,6 @@ /* -Create a suitable configuration for kdm taking old xdm/kdm +Create a suitable configuration for tdm taking old xdm/tdm installations into account Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org> @@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -static const char *newdir = KDMCONF, *facesrc = KDMDATA "/pics/users", +static const char *newdir = TDMCONF, *facesrc = TDMDATA "/pics/users", *oldxdm, *oldkde; static int oldver; @@ -350,7 +350,7 @@ locate( const char *exe ) /* - * target data to be written to kdmrc + * target data to be written to tdmrc */ typedef struct Entry { @@ -369,10 +369,10 @@ typedef struct Section { Entry *ents; } Section; -static Section *config; /* the kdmrc data to be written */ +static Section *config; /* the tdmrc data to be written */ /* - * Specification of the (currently possible) kdmrc entries + * Specification of the (currently possible) tdmrc entries */ typedef struct Ent { @@ -392,7 +392,7 @@ static Sect *findSect( const char *name ); static Ent *findEnt( Sect *sect, const char *key ); /* - * Functions to manipulate the current kdmrc data + * Functions to manipulate the current tdmrc data */ static const char * @@ -594,12 +594,12 @@ static const char def_startup[] = " xmessage -file /etc/nologin -geometry 640x480\n" " fi\n" " if [ \"$(id -u)\" != \"0\" ] && \\\n" -" ! grep -qs '^ignore-nologin' /etc/trinity/kdm/kdm.options; then\n" +" ! grep -qs '^ignore-nologin' /etc/trinity/tdm/tdm.options; then\n" " exit 1\n" " fi\n" "fi\n" "\n" -"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n" +"if grep -qs '^use-sessreg' /etc/trinity/tdm/tdm.options && \\\n" " which sessreg > /dev/null 2>&1; then\n" " exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" @@ -620,7 +620,7 @@ static const char def_reset[] = "#devname=`echo $DISPLAY | cut -c1-8`\n" "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\"" #else -"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n" +"if grep -qs '^use-sessreg' /etc/trinity/tdm/tdm.options && \\\n" " which sessreg > /dev/null 2>&1; then\n" " exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" @@ -765,7 +765,7 @@ resect( const char *sec, const char *name ) static int inNewDir( const char *name ) { - return !memcmp( name, KDMCONF "/", sizeof(KDMCONF) ); + return !memcmp( name, TDMCONF "/", sizeof(TDMCONF) ); } static int @@ -839,7 +839,7 @@ copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) ) return 1; tptr = strrchr( tname, '/' ); - ASPrintf( &nname, KDMCONF "/%s", tptr ? tptr + 1 : tname ); + ASPrintf( &nname, TDMCONF "/%s", tptr ? tptr + 1 : tname ); if (inList( cflist, ce->value ) || inList( eflist, ce->value ) || inList( lflist, ce->value )) @@ -1322,7 +1322,7 @@ cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED ) if (old_confs) linkfile( ce ); else - if (!copyfile( ce, "kdmkeys", 0600, 0 )) + if (!copyfile( ce, "tdmkeys", 0600, 0 )) ce->active = 0; } @@ -1351,7 +1351,7 @@ mk_willing( Entry *ce, Section *cs ATTR_UNUSED ) dlinkfile( fname ); else { dflt: - ce->value = KDMCONF "/Xwilling"; + ce->value = TDMCONF "/Xwilling"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_willing ); } @@ -1459,18 +1459,18 @@ edit_setup( File *file ) int chg = delstr( file, "\n" "(\n" - " PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" - " */kdmdesktop\t&\n" + " PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n" + " */tdmdesktop\t&\n" " echo $! >$PIDFILE\n" " wait $!\n" " rm $PIDFILE\n" ")\t&\n" ) | delstr( file, "\n" - "*/kdmdesktop\t&\n" ) | + "*/tdmdesktop\t&\n" ) | delstr( file, "\n" - "kdmdesktop\t&\n" ) | + "tdmdesktop\t&\n" ) | delstr( file, "\n" - "kdmdesktop\n" ); + "tdmdesktop\n" ); putval( "UseBackground", chg ? "true" : "false" ); return chg; } @@ -1490,7 +1490,7 @@ mk_setup( Entry *ce, Section *cs ) else linkfile( ce ); } else { - ce->value = KDMCONF "/Xsetup"; + ce->value = TDMCONF "/Xsetup"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_setup ); } @@ -1504,12 +1504,12 @@ edit_startup( File *file ) if (mod_usebg && (delstr( file, "\n" - "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" + "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n" "if [[] -f $PIDFILE ] ; then\n" " kill `cat $PIDFILE`\n" "fi\n" ) || delstr( file, "\n" - "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" + "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n" "test -f $PIDFILE && kill `cat $PIDFILE`\n" ))) chg1 = 1; if (oldver < 0x0203) { @@ -1571,7 +1571,7 @@ mk_startup( Entry *ce, Section *cs ) else linkfile( ce ); } else { - ce->value = KDMCONF "/Xstartup"; + ce->value = TDMCONF "/Xstartup"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_startup ); } @@ -1616,7 +1616,7 @@ mk_reset( Entry *ce, Section *cs ATTR_UNUSED ) else linkfile( ce ); } else { - ce->value = KDMCONF "/Xreset"; + ce->value = TDMCONF "/Xreset"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_reset ); } @@ -1639,7 +1639,7 @@ mk_session( Entry *ce, Section *cs ATTR_UNUSED ) "`tempfile`" : "$HOME/.xsession-env-$DISPLAY"; ASPrintf( &def_session, "%s%s%s", def_session1, tmpf, def_session2 ); - ce->value = KDMCONF "/Xsession"; + ce->value = TDMCONF "/Xsession"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_session ); } @@ -1770,8 +1770,8 @@ upd_datadir( Entry *ce, Section *cs ATTR_UNUSED ) return; dir = ce->active ? ce->value : def_DataDir; if (mkdirp( dir, 0755, "data", 0 ) && oldkde) { - ASPrintf( &oldsts, "%s/kdm/kdmsts", oldkde ); - ASPrintf( &newsts, "%s/kdmsts", dir ); + ASPrintf( &oldsts, "%s/tdm/tdmsts", oldkde ); + ASPrintf( &newsts, "%s/tdmsts", dir ); rename( oldsts, newsts ); } } @@ -1808,7 +1808,7 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED ) setpwent(); while ((pw = getpwent())) if (strcmp( pw->pw_name, "root" )) { - ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/%s.png", + ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/%s.png", oldkde, pw->pw_name ); ASPrintf( &newpic, "%s/%s.face.icon", dir, pw->pw_name ); rename( oldpic, newpic ); @@ -1816,10 +1816,10 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED ) free( oldpic ); } endpwent(); - ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/default.png", oldkde ); + ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/default.png", oldkde ); if (!rename( oldpic, defpic )) defpic = 0; - ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/root.png", oldkde ); + ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/root.png", oldkde ); if (!rename( oldpic, rootpic )) rootpic = 0; } @@ -2051,12 +2051,12 @@ mergeKdmRcOld( const char *path ) char *p; struct stat st; - ASPrintf( &p, "%s/kdmrc", path ); + ASPrintf( &p, "%s/tdmrc", path ); if (stat( p, &st )) { free( p ); return 0; } - printf( "Information: ignoring old kdmrc %s from kde < 2.2\n", p ); + printf( "Information: ignoring old tdmrc %s from kde < 2.2\n", p ); free( p ); return 1; } @@ -2083,18 +2083,18 @@ applydefs( FDefs *chgdef, int ndefs, const char *path ) } #ifdef XDMCP -static FDefs kdmdefs_all[] = { -{ "Xdmcp", "Xaccess", "%s/kdm/Xaccess", 0 }, +static FDefs tdmdefs_all[] = { +{ "Xdmcp", "Xaccess", "%s/tdm/Xaccess", 0 }, { "Xdmcp", "Willing", "", 0 }, }; #endif -static FDefs kdmdefs_eq_22[] = { +static FDefs tdmdefs_eq_22[] = { { "General", "PidFile", "/var/run/xdm.pid", 0 }, -{ "X-*-Core", "Setup", "%s/kdm/Xsetup", 0 }, -{ "X-*-Core", "Startup", "%s/kdm/Xstartup", 0 }, -{ "X-*-Core", "Reset", "%s/kdm/Xreset", 0 }, -{ "X-*-Core", "Session", "%s/kdm/Xsession", 0 }, +{ "X-*-Core", "Setup", "%s/tdm/Xsetup", 0 }, +{ "X-*-Core", "Startup", "%s/tdm/Xstartup", 0 }, +{ "X-*-Core", "Reset", "%s/tdm/Xreset", 0 }, +{ "X-*-Core", "Session", "%s/tdm/Xsession", 0 }, }; #ifdef XDMCP @@ -2104,13 +2104,13 @@ if_xdmcp (void) return isTrue( getfqval( "Xdmcp", "Enable", "true" ) ); } -static FDefs kdmdefs_le_30[] = { -{ "Xdmcp", "KeyFile", "%s/kdm/kdmkeys", if_xdmcp }, +static FDefs tdmdefs_le_30[] = { +{ "Xdmcp", "KeyFile", "%s/tdm/tdmkeys", if_xdmcp }, }; #endif /* HACK: misused by is22conf() below */ -static FDefs kdmdefs_ge_30[] = { +static FDefs tdmdefs_ge_30[] = { { "X-*-Core", "Setup", "", 0 }, { "X-*-Core", "Startup", "", 0 }, { "X-*-Core", "Reset", "", 0 }, @@ -2123,8 +2123,8 @@ if_usebg (void) return isTrue( getfqval( "X-*-Greeter", "UseBackground", "true" ) ); } -static FDefs kdmdefs_ge_31[] = { -{ "X-*-Greeter","BackgroundCfg","%s/kdm/backgroundrc", if_usebg }, +static FDefs tdmdefs_ge_31[] = { +{ "X-*-Greeter","BackgroundCfg","%s/tdm/backgroundrc", if_usebg }, }; static int @@ -2134,10 +2134,10 @@ is22conf( const char *path ) const char *val; int i, sl; - sl = ASPrintf( &p, "%s/kdm/", path ); + sl = ASPrintf( &p, "%s/tdm/", path ); /* safe bet, i guess ... */ for (i = 0; i < 4; i++) { - val = getfqval( "X-*-Core", kdmdefs_ge_30[i].key, 0 ); + val = getfqval( "X-*-Core", tdmdefs_ge_30[i].key, 0 ); if (val && !memcmp( val, p, sl )) { free( p ); return 0; @@ -2184,12 +2184,12 @@ mergeKdmRcNewer( const char *path ) int i, j; static char sname[64]; - ASPrintf( &p, "%s/kdm/kdmrc", path ); + ASPrintf( &p, "%s/tdm/tdmrc", path ); if (!(rootsect = ReadConf( p ))) { free( p ); return 0; } - printf( "Information: reading current kdmrc %s (from kde >= 2.2.x)\n", p ); + printf( "Information: reading current tdmrc %s (from kde >= 2.2.x)\n", p ); free( p ); for (cs = rootsect; cs; cs = cs->next) { @@ -2241,29 +2241,29 @@ mergeKdmRcNewer( const char *path ) } #ifdef XDMCP - applydefs( kdmdefs_all, as(kdmdefs_all), path ); + applydefs( tdmdefs_all, as(tdmdefs_all), path ); #endif if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */ mod_usebg = 1; if (is22conf( path )) { /* work around 2.2.x defaults borkedness */ - applydefs( kdmdefs_eq_22, as(kdmdefs_eq_22), path ); - printf( "Information: current kdmrc is from kde 2.2\n" ); + applydefs( tdmdefs_eq_22, as(tdmdefs_eq_22), path ); + printf( "Information: current tdmrc is from kde 2.2\n" ); } else { - applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path ); - printf( "Information: current kdmrc is from kde 3.0\n" ); + applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path ); + printf( "Information: current tdmrc is from kde 3.0\n" ); } #ifdef XDMCP /* work around minor <= 3.0.x defaults borkedness */ - applydefs( kdmdefs_le_30, as(kdmdefs_le_30), path ); + applydefs( tdmdefs_le_30, as(tdmdefs_le_30), path ); #endif } else { int ma, mi; sscanf( cp, "%d.%d", &ma, &mi ); oldver = (ma << 8) | mi; - printf( "Information: current kdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi ); - applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path ); - applydefs( kdmdefs_ge_31, as(kdmdefs_ge_31), path ); + printf( "Information: current tdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi ); + applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path ); + applydefs( tdmdefs_ge_31, as(tdmdefs_ge_31), path ); } return 1; @@ -2384,12 +2384,12 @@ P_requestPort( const char *sect, char **value ) } #endif -static int kdmrcmode = 0644; +static int tdmrcmode = 0644; static void P_autoPass( const char *sect ATTR_UNUSED, char **value ATTR_UNUSED ) { - kdmrcmode = 0600; + tdmrcmode = 0600; } CONF_GEN_XMERGE @@ -2547,7 +2547,7 @@ static const char *oldxdms[] = { int main( int argc, char **argv ) { const char **where; - char *newkdmrc; + char *newtdmrc; FILE *f; StrList *fp; Section *cs; @@ -2560,41 +2560,41 @@ int main( int argc, char **argv ) for (ap = 1; ap < argc; ap++) { if (!strcmp( argv[ap], "--help" )) { printf( -"genkdmconf - generate configuration files for kdm\n" +"gentdmconf - generate configuration files for tdm\n" "\n" -"If an older xdm/kdm configuration is found, its config files are \"absorbed\";\n" +"If an older xdm/tdm configuration is found, its config files are \"absorbed\";\n" "if it lives in the new target directory, its scripts are reused (and possibly\n" "modified) as well, otherwise the scripts are ignored and default scripts are\n" "installed.\n" "\n" "options:\n" -" --in /path/to/new/kdm-config-dir\n" +" --in /path/to/new/tdm-config-dir\n" " In which directory to put the new configuration. You can use this\n" " to support a $(DESTDIR), but not to change the final location of\n" " the installation - the paths inside the files are not affected.\n" -" Default is " KDMCONF ".\n" +" Default is " TDMCONF ".\n" " --old-xdm /path/to/old/xdm-dir\n" -" Where to look for the config files of an xdm/older kdm.\n" -" Default is to scan /etc/X11/kdm, $XLIBDIR/kdm, /etc/X11/xdm,\n" -" $XLIBDIR/xdm; there in turn look for kdm-config and xdm-config.\n" +" Where to look for the config files of an xdm/older tdm.\n" +" Default is to scan /etc/X11/tdm, $XLIBDIR/tdm, /etc/X11/xdm,\n" +" $XLIBDIR/xdm; there in turn look for tdm-config and xdm-config.\n" " Note that you possibly need to use --no-old-kde to make this take effect.\n" " --old-kde /path/to/old/kde-config-dir\n" -" Where to look for the kdmrc of an older kdm.\n" +" Where to look for the tdmrc of an older tdm.\n" " Default is to scan " KDE_CONFDIR " and\n" " {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n" " --no-old\n" -" Don't look at older xdm/kdm configurations, just create default config.\n" +" Don't look at older xdm/tdm configurations, just create default config.\n" " --no-old-xdm\n" " Don't look at older xdm configurations.\n" " --no-old-kde\n" -" Don't look at older kdm configurations.\n" +" Don't look at older tdm configurations.\n" " --old-scripts\n" -" Directly use all scripts from the older xdm/kdm configuration.\n" +" Directly use all scripts from the older xdm/tdm configuration.\n" " --no-old-scripts\n" -" Don't use scripts from the older xdm/kdm configuration even if it lives\n" +" Don't use scripts from the older xdm/tdm configuration even if it lives\n" " in the new target directory.\n" " --old-confs\n" -" Directly use all ancillary config files from the older xdm/kdm\n" +" Directly use all ancillary config files from the older xdm/tdm\n" " configuration. This is usually a bad idea.\n" " --no-backup\n" " Overwrite/delete old config files instead of backing them up.\n" @@ -2654,7 +2654,7 @@ int main( int argc, char **argv ) } *where = argv[++ap]; } - if (memcmp( newdir, KDMCONF, sizeof(KDMCONF) )) + if (memcmp( newdir, TDMCONF, sizeof(TDMCONF) )) use_destdir = 1; if (!mkdirp( newdir, 0755, "target", 1 )) @@ -2685,7 +2685,7 @@ int main( int argc, char **argv ) if (oldkde) { if (!(newer = mergeKdmRcNewer( oldkde )) && !mergeKdmRcOld( oldkde )) fprintf( stderr, - "Cannot read old kdmrc at specified location\n" ); + "Cannot read old tdmrc at specified location\n" ); } else if (!no_old_kde) { for (i = 0; i < as(oldkdes); i++) { if ((newer = mergeKdmRcNewer( oldkdes[i] )) || @@ -2701,7 +2701,7 @@ int main( int argc, char **argv ) if (oldxdm) { if (!mergeXdmCfg( oldxdm )) fprintf( stderr, - "Cannot read old kdm-config/xdm-config at specified location\n" ); + "Cannot read old tdm-config/xdm-config at specified location\n" ); } else for (i = 0; i < as(oldxdms); i++) if (mergeXdmCfg( oldxdms[i] )) { @@ -2791,8 +2791,8 @@ int main( int argc, char **argv ) for (ce = cs->ents; ce; ce = ce->next) if (ce->spec->func && i == ce->spec->prio) ce->spec->func( ce, cs ); - ASPrintf( &newkdmrc, "%s/kdmrc", newdir ); - f = Create( newkdmrc, kdmrcmode ); + ASPrintf( &newtdmrc, "%s/tdmrc", newdir ); + f = Create( newtdmrc, tdmrcmode ); wrconf( f ); fclose( f ); @@ -2800,12 +2800,12 @@ int main( int argc, char **argv ) f = Create( nname, 0644 ); fprintf( f, "This automatically generated configuration consists of the following files:\n" ); - fprintf( f, "- " KDMCONF "/kdmrc\n" ); + fprintf( f, "- " TDMCONF "/tdmrc\n" ); for (fp = aflist; fp; fp = fp->next) fprintf( f, "- %s\n", fp->str ); if (use_destdir && !no_in_notice) fwrapprintf( f, -"All files destined for " KDMCONF " were actually saved in %s; " +"All files destined for " TDMCONF " were actually saved in %s; " "this config won't be workable until moved in place.\n", newdir ); if (uflist || eflist || cflist || lflist) { fprintf( f, @@ -2841,7 +2841,7 @@ int main( int argc, char **argv ) "Old files that would have been overwritten were renamed to <oldname>.bak.\n" ); } fprintf( f, -"\nTry 'genkdmconf --help' if you want to generate another configuration.\n" +"\nTry 'gentdmconf --help' if you want to generate another configuration.\n" "\nYou may delete this README.\n" ); fclose( f ); diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp index 9f8f5064d..00b08cd35 100644 --- a/kdm/kfrontend/kchooser.cpp +++ b/kdm/kfrontend/kchooser.cpp @@ -1,6 +1,6 @@ /* -chooser widget for KDM +chooser widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de> @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "kchooser.h" #include "kconsole.h" -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" #include <klocale.h> @@ -101,7 +101,7 @@ ChooserDlg::ChooserDlg() // TQPushButton *helpButton = new TQPushButton( i18n("&Help"), this ); // hbox->addWidget( helpButton ); -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE if (consoleView) vbox->addWidget( consoleView ); #endif diff --git a/kdm/kfrontend/kchooser.h b/kdm/kfrontend/kchooser.h index da5b83d89..fcf14b1e1 100644 --- a/kdm/kfrontend/kchooser.h +++ b/kdm/kfrontend/kchooser.h @@ -1,6 +1,6 @@ /* -chooser widget for KDM +chooser widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de> diff --git a/kdm/kfrontend/kconsole.cpp b/kdm/kfrontend/kconsole.cpp index 6c2ab09ab..834507bdb 100644 --- a/kdm/kfrontend/kconsole.cpp +++ b/kdm/kfrontend/kconsole.cpp @@ -1,6 +1,6 @@ /* -xconsole widget for KDM +xconsole widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <config.h> -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE #include <stdlib.h> #include <stdio.h> @@ -53,8 +53,8 @@ extern "C" { #include "kconsole.h" -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" #include <klocale.h> #include <kpty.h> diff --git a/kdm/kfrontend/kconsole.h b/kdm/kfrontend/kconsole.h index 73d13912e..2b3e2aac3 100644 --- a/kdm/kfrontend/kconsole.h +++ b/kdm/kfrontend/kconsole.h @@ -1,6 +1,6 @@ /* -xconsole widget for KDM +xconsole widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdm/kfrontend/kdm_config.c b/kdm/kfrontend/kdm_config.c index d8dba0412..48f316320 100644 --- a/kdm/kfrontend/kdm_config.c +++ b/kdm/kfrontend/kdm_config.c @@ -1,6 +1,6 @@ /* -Read options from kdmrc +Read options from tdmrc Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org> @@ -117,7 +117,7 @@ static void *Malloc( size_t size ); static void *Realloc( void *ptr, size_t size ); #define PRINT_QUOTES -#define LOG_NAME "kdm_config" +#define LOG_NAME "tdm_config" #define LOG_DEBUG_MASK DEBUG_CONFIG #define LOG_PANIC_EXIT 1 #define STATIC static @@ -381,8 +381,8 @@ PautoLoginX( Value *retval ) CONF_READ_ENTRIES -static const char *kdmrc = KDMCONF "/kdmrc"; -static const char *kdmrc_dist = KDMCONF "/kdmdistrc"; +static const char *tdmrc = TDMCONF "/tdmrc"; +static const char *tdmrc_dist = TDMCONF "/tdmdistrc"; static Section *rootsec; @@ -403,14 +403,14 @@ ReadConf() return; confread = 1; - Debug( "reading config %s ...\n", kdmrc_dist ); - if (!readFile( &file, kdmrc_dist, "master configuration" )) { - Debug( "reading config %s ...\n", kdmrc ); - if (!readFile( &file, kdmrc, "master configuration" )) + Debug( "reading config %s ...\n", tdmrc_dist ); + if (!readFile( &file, tdmrc_dist, "master configuration" )) { + Debug( "reading config %s ...\n", tdmrc ); + if (!readFile( &file, tdmrc, "master configuration" )) return; } else { - kdmrc = kdmrc_dist; + tdmrc = tdmrc_dist; } for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { @@ -436,7 +436,7 @@ ReadConf() e--; if (*e != ']') { cursec = 0; - LogError( "Invalid section header at %s:%d\n", kdmrc, line ); + LogError( "Invalid section header at %s:%d\n", tdmrc, line ); continue; } nstr = sl + 1; @@ -446,7 +446,7 @@ ReadConf() !memcmp( nstr, cursec->name, nlen )) { LogInfo( "Multiple occurrences of section [%.*s] in %s. " - "Consider merging them.\n", nlen, nstr, kdmrc ); + "Consider merging them.\n", nlen, nstr, tdmrc ); goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { @@ -502,7 +502,7 @@ ReadConf() illsec: cursec = 0; LogError( "Unrecognized section name [%.*s] at %s:%d\n", - nlen, nstr, kdmrc, line ); + nlen, nstr, tdmrc, line ); continue; newsec: if (!(cursec = Malloc( sizeof(*cursec) ))) @@ -530,7 +530,7 @@ ReadConf() if (!cursec) { if (sectmoan) { sectmoan = 0; - LogError( "Entry outside any section at %s:%d", kdmrc, line ); + LogError( "Entry outside any section at %s:%d", tdmrc, line ); } goto sktoeol; } @@ -538,13 +538,13 @@ ReadConf() for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; - LogError( "Invalid entry (missing '=') at %s:%d\n", kdmrc, line ); + LogError( "Invalid entry (missing '=') at %s:%d\n", tdmrc, line ); continue; haveeq: for (ek = s - 1; ; ek--) { if (ek < sl) { - LogError( "Invalid entry (empty key) at %s:%d\n", kdmrc, line ); + LogError( "Invalid entry (empty key) at %s:%d\n", tdmrc, line ); goto sktoeol; } if (!isspace( *ek )) @@ -558,7 +558,7 @@ ReadConf() if (*s == '\\') { s++; if (s >= file.eof || *s == '\n') { - LogError( "Trailing backslash at %s:%d\n", kdmrc, line ); + LogError( "Trailing backslash at %s:%d\n", tdmrc, line ); break; } switch (*s) { @@ -587,14 +587,14 @@ ReadConf() goto keyok; } LogError( "Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", - nlen, nstr, cursec->nlen, cursec->name, kdmrc, line ); + nlen, nstr, cursec->nlen, cursec->name, tdmrc, line ); continue; keyok: for (curent = cursec->entries; curent; curent = curent->next) if (ce == curent->ent) { LogError( "Multiple occurrences of key '%s' in section [%.*s]" " of %s\n", - ce->name, cursec->nlen, cursec->name, kdmrc ); + ce->name, cursec->nlen, cursec->name, tdmrc ); goto keyfnd; } if (!(curent = Malloc( sizeof(*curent) ))) @@ -796,7 +796,7 @@ GetValue( Ent *et, DSpec *dspec, Value *retval, char **eopts ) if (!(errs = CvtValue( et, retval, ent->vallen, ent->val, eopts ))) return; LogError( "Invalid %s value '%.*s' at %s:%d\n", - errs, ent->vallen, ent->val, kdmrc, ent->line ); + errs, ent->vallen, ent->val, tdmrc, ent->line ); } Debug( "default: %s = %'s\n", et->name, et->def ); if ((errs = CvtValue( et, retval, strlen( et->def ), et->def, eopts ))) @@ -1368,7 +1368,7 @@ int main( int argc ATTR_UNUSED, char **argv ) int what; if (!(ci = getenv( "CONINFO" ))) { - fprintf( stderr, "This program is part of kdm and should not be run manually.\n" ); + fprintf( stderr, "This program is part of tdm and should not be run manually.\n" ); return 1; } if (sscanf( ci, "%d %d", &rfd, &wfd ) != 2) @@ -1381,7 +1381,7 @@ int main( int argc ATTR_UNUSED, char **argv ) /* Debug ("parsing command line\n");*/ if (**++argv) - kdmrc_dist = kdmrc = *argv; + tdmrc_dist = tdmrc = *argv; /* while (*++argv) { } @@ -1402,7 +1402,7 @@ int main( int argc ATTR_UNUSED, char **argv ) #else GSendInt( 1 ); #endif - GSendStr( kdmrc ); + GSendStr( tdmrc ); GSendInt( -1 ); #ifdef XDMCP GSendNStr( VXaccess.ptr, VXaccess.len - 1 ); diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c index b7841e6a3..f74c2410d 100644 --- a/kdm/kfrontend/kdm_greet.c +++ b/kdm/kfrontend/kdm_greet.c @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <config.h> -#include "kdm_greet.h" -#include "kdmconfig.h" +#include "tdm_greet.h" +#include "tdmconfig.h" #include <stdio.h> #include <stdlib.h> @@ -71,7 +71,7 @@ Realloc( void *ptr, size_t size ) #define PRINT_QUOTES #define PRINT_ARRAYS -#define LOG_NAME "kdm_greet" +#define LOG_NAME "tdm_greet" #define LOG_DEBUG_MASK DEBUG_GREET #define LOG_PANIC_EXIT 1 #define STATIC @@ -742,7 +742,7 @@ main( int argc ATTR_UNUSED, char **argv ) char qtrc[40]; if (!(ci = getenv( "CONINFO" ))) { - fprintf( stderr, "This program is part of kdm and should not be run manually.\n" ); + fprintf( stderr, "This program is part of tdm and should not be run manually.\n" ); return 1; } if (sscanf( ci, "%d %d %d %d", &srfd, &swfd, &mrfd, &mwfd ) != 4) diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h index df325c28d..9f7e3bd6a 100644 --- a/kdm/kfrontend/kdm_greet.h +++ b/kdm/kfrontend/kdm_greet.h @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KDM_GREET_H_ -#define _KDM_GREET_H_ +#ifndef _TDM_GREET_H_ +#define _TDM_GREET_H_ #include <greet.h> /* for the ATTR_ defines */ #include <config.ci> /* for the HAVE_VTS define */ @@ -88,4 +88,4 @@ extern char *dname; /* d->name */ } #endif -#endif /* _KDM_GREET_H_ */ +#endif /* _TDM_GREET_H_ */ diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp index 637d6dd90..6486eb3dc 100644 --- a/kdm/kfrontend/kdmadmindialog.cpp +++ b/kdm/kfrontend/kdmadmindialog.cpp @@ -22,10 +22,10 @@ */ -#include "kdmadmindialog.h" -#include "kdmconfig.h" +#include "tdmadmindialog.h" +#include "tdmconfig.h" #include "kgdialog.h" -#include "kdm_greet.h" +#include "tdm_greet.h" #include <stdlib.h> #include <kapplication.h> @@ -41,10 +41,10 @@ #include <tqaccel.h> #include <tqpopupmenu.h> -int KDMAdmin::curPlugin = -1; -PluginList KDMAdmin::pluginList; +int TDMAdmin::curPlugin = -1; +PluginList TDMAdmin::pluginList; -KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) +TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) : inherited( _parent ) , verify( 0 ), curUser(user) { @@ -93,14 +93,14 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) slotWhenChanged(); } -KDMAdmin::~KDMAdmin() +TDMAdmin::~TDMAdmin() { hide(); delete verify; } void -KDMAdmin::slotActivatePlugMenu() +TDMAdmin::slotActivatePlugMenu() { TQPopupMenu *cmnu = verify->getPlugMenu(); TQSize sh( cmnu->sizeHint() / 2 ); @@ -108,13 +108,13 @@ KDMAdmin::slotActivatePlugMenu() } void -KDMAdmin::accept() +TDMAdmin::accept() { verify->accept(); } void -KDMAdmin::slotWhenChanged() +TDMAdmin::slotWhenChanged() { verify->abort(); verify->setEnabled( 1 ); @@ -122,7 +122,7 @@ KDMAdmin::slotWhenChanged() } void -KDMAdmin::bye_bye() +TDMAdmin::bye_bye() { GSendInt( G_GetDmrc ); GSendStr( "Session" ); @@ -141,36 +141,36 @@ KDMAdmin::bye_bye() } void -KDMAdmin::verifyPluginChanged( int id ) +TDMAdmin::verifyPluginChanged( int id ) { curPlugin = id; adjustSize(); } void -KDMAdmin::verifyOk() +TDMAdmin::verifyOk() { bye_bye(); } void -KDMAdmin::verifyFailed() +TDMAdmin::verifyFailed() { okButton->setEnabled( false ); cancelButton->setEnabled( false ); } void -KDMAdmin::verifyRetry() +TDMAdmin::verifyRetry() { okButton->setEnabled( true ); cancelButton->setEnabled( true ); } void -KDMAdmin::verifySetUser( const TQString & ) +TDMAdmin::verifySetUser( const TQString & ) { } -#include "kdmadmindialog.moc" +#include "tdmadmindialog.moc" diff --git a/kdm/kfrontend/kdmadmindialog.h b/kdm/kfrontend/kdmadmindialog.h index 91f1ed3a6..e5a68fbb9 100644 --- a/kdm/kfrontend/kdmadmindialog.h +++ b/kdm/kfrontend/kdmadmindialog.h @@ -23,8 +23,8 @@ */ -#ifndef KDMADMIN_H -#define KDMADMIN_H +#ifndef TDMADMIN_H +#define TDMADMIN_H #include "kgverify.h" @@ -36,13 +36,13 @@ class KPushButton; class TQButtonGroup; class TQComboBox; -class KDMAdmin : public FDialog, public KGVerifyHandler { +class TDMAdmin : public FDialog, public KGVerifyHandler { Q_OBJECT typedef FDialog inherited; public: - KDMAdmin( const TQString &user, TQWidget *_parent = 0 ); - ~KDMAdmin(); + TDMAdmin( const TQString &user, TQWidget *_parent = 0 ); + ~TDMAdmin(); public slots: void accept(); diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 88cd53970..2b2a99cea 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -1,6 +1,6 @@ /* -clock module for kdm +clock module for tdm Copyright (C) 2000 Espen Sand, espen@kde.org Based on work by NN(yet to be determined) @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmclock.h" +#include "tdmclock.h" //#include <kapplication.h> //#include <kconfig.h> @@ -173,4 +173,4 @@ void KdmClock::paintEvent( TQPaintEvent * ) bitBlt( this, contentsRect().topLeft(), &pm ); } -#include "kdmclock.moc" +#include "tdmclock.moc" diff --git a/kdm/kfrontend/kdmclock.h b/kdm/kfrontend/kdmclock.h index 91fa181ea..89a48eb8e 100644 --- a/kdm/kfrontend/kdmclock.h +++ b/kdm/kfrontend/kdmclock.h @@ -1,6 +1,6 @@ /* -clock module for kdm +clock module for tdm Copyright (C) 2000 Espen Sand, espen@kde.org Based on work by NN (yet to be determined) @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KDM_CLOCK_H_ -#define _KDM_CLOCK_H_ +#ifndef _TDM_CLOCK_H_ +#define _TDM_CLOCK_H_ #include <tqframe.h> diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp index c12345323..5b57a6375 100644 --- a/kdm/kfrontend/kdmconfig.cpp +++ b/kdm/kfrontend/kdmconfig.cpp @@ -1,6 +1,6 @@ /* -Config for kdm +Config for tdm Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" #include <kapplication.h> #include <klocale.h> @@ -110,7 +110,7 @@ void init_config( void ) _hasConsole = _hasConsole && _isLocal && GetCfgInt( C_hasConsole ); _authorized = GetCfgInt( C_isAuthorized ); - _stsFile = _dataDir + "/kdmsts"; + _stsFile = _dataDir + "/tdmsts"; // Greet String char hostname[256], *ptr; @@ -138,7 +138,7 @@ void init_config( void ) case 's': ptr = tuname.sysname; break; case 'r': ptr = tuname.release; break; case 'm': ptr = tuname.machine; break; - default: _greetString += i18n("[fix kdmrc!]"); continue; + default: _greetString += i18n("[fix tdmrc!]"); continue; } _greetString += TQString::fromLocal8Bit( ptr ); } else diff --git a/kdm/kfrontend/kdmconfig.h b/kdm/kfrontend/kdmconfig.h index 52e054af6..275cafa1b 100644 --- a/kdm/kfrontend/kdmconfig.h +++ b/kdm/kfrontend/kdmconfig.h @@ -1,6 +1,6 @@ /* -Configuration for kdm +Configuration for tdm Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMCONFIG_H -#define KDMCONFIG_H +#ifndef TDMCONFIG_H +#define TDMCONFIG_H #include <config.h> @@ -66,4 +66,4 @@ void init_config( void ); CONF_GREET_C_DECLS -#endif /* KDMCONFIG_H */ +#endif /* TDMCONFIG_H */ diff --git a/kdm/kfrontend/kdmctl.c b/kdm/kfrontend/kdmctl.c index 7f70a4ddc..d6abe959a 100644 --- a/kdm/kfrontend/kdmctl.c +++ b/kdm/kfrontend/kdmctl.c @@ -1,6 +1,6 @@ /* -KDM remote control application +TDM remote control application Copyright (C) 2004 Oswald Buddenhagen <ossi@kde.org> @@ -59,7 +59,7 @@ readcfg( const char *cfg ) if (!(fp = fopen( cfg, "r" ))) { fprintf( stderr, - "Cannot open kdm config file '%s'.\n", + "Cannot open tdm config file '%s'.\n", cfg ); return 0; } @@ -148,7 +148,7 @@ main( int argc, char **argv ) { char *dpy = getenv( "DISPLAY" ); const char *ctl = getenv( "DM_CONTROL" ); - const char *cfg = KDE_CONFDIR "/kdm/kdmrc"; + const char *cfg = KDE_CONFDIR "/tdm/tdmrc"; char *ptr; int fd; @@ -162,19 +162,19 @@ main( int argc, char **argv ) ptr++; if (!strcmp( ptr, "h" ) || !strcmp( ptr, "help" )) { puts( -"Usage: kdmctl [options] [command [command arguments]]\n" +"Usage: tdmctl [options] [command [command arguments]]\n" "\n" "Options are:\n" " -h -help This help message.\n" " -g -global Use global control socket even if $DISPLAY is set\n" " -d -display Override $DISPLAY\n" " -s -sockets Override $DM_CONTROL\n" -" -c -config Use alternative kdm config file\n" +" -c -config Use alternative tdm config file\n" "\n" "The directory in which the sockets are located is determined this way:\n" "- the -s option is examined\n" "- the $DM_CONTROL variable is examined\n" -"- the kdm config file is searched for the FifoDir key\n" +"- the tdm config file is searched for the FifoDir key\n" "- /var/run/xdmctl and /var/run are tried\n" "\n" "If $DISPLAY is set (or -d was specified) and -g was not specified, the\n" @@ -184,7 +184,7 @@ main( int argc, char **argv ) "Command arguments can be specified as separate command line parameters,\n" "in which case they are simply concatenated with tabs in between.\n" "\n" -"If the command is '-', kdmctl reads commands from stdin.\n" +"If the command is '-', tdmctl reads commands from stdin.\n" "The default command is 'caps'.\n" ); return 0; diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index 96f80e9a7..e546f62b6 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmshutdown.h" -#include "kdm_greet.h" +#include "tdmshutdown.h" +#include "tdm_greet.h" #include <kapplication.h> #include <kseparator.h> @@ -59,10 +59,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. extern bool has_twin; -int KDMShutdownBase::curPlugin = -1; -PluginList KDMShutdownBase::pluginList; +int TDMShutdownBase::curPlugin = -1; +PluginList TDMShutdownBase::pluginList; -KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent ) +TDMShutdownBase::TDMShutdownBase( int _uid, TQWidget *_parent ) : inherited( _parent ) , box( new TQVBoxLayout( this, KDmh, KDsh ) ) #ifdef HAVE_VTS @@ -79,14 +79,14 @@ KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent ) { } -KDMShutdownBase::~KDMShutdownBase() +TDMShutdownBase::~TDMShutdownBase() { hide(); delete verify; } void -KDMShutdownBase::complete( TQWidget *prevWidget ) +TDMShutdownBase::complete( TQWidget *prevWidget ) { TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); @@ -143,7 +143,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) } void -KDMShutdownBase::slotActivatePlugMenu() +TDMShutdownBase::slotActivatePlugMenu() { if (needRoot) { TQPopupMenu *cmnu = verify->getPlugMenu(); @@ -155,7 +155,7 @@ KDMShutdownBase::slotActivatePlugMenu() } void -KDMShutdownBase::accept() +TDMShutdownBase::accept() { if (needRoot == 1) verify->accept(); @@ -164,13 +164,13 @@ KDMShutdownBase::accept() } void -KDMShutdownBase::slotSched() +TDMShutdownBase::slotSched() { done( Schedule ); } void -KDMShutdownBase::updateNeedRoot() +TDMShutdownBase::updateNeedRoot() { int nNeedRoot = uid && (((willShut && _allowShutdown == SHUT_ROOT) || @@ -187,40 +187,40 @@ KDMShutdownBase::updateNeedRoot() } void -KDMShutdownBase::accepted() +TDMShutdownBase::accepted() { inherited::done( needRoot ? (int)Authed : (int)Accepted ); } void -KDMShutdownBase::verifyPluginChanged( int id ) +TDMShutdownBase::verifyPluginChanged( int id ) { curPlugin = id; adjustSize(); } void -KDMShutdownBase::verifyOk() +TDMShutdownBase::verifyOk() { accepted(); } void -KDMShutdownBase::verifyFailed() +TDMShutdownBase::verifyFailed() { okButton->setEnabled( false ); cancelButton->setEnabled( false ); } void -KDMShutdownBase::verifyRetry() +TDMShutdownBase::verifyRetry() { okButton->setEnabled( true ); cancelButton->setEnabled( true ); } void -KDMShutdownBase::verifySetUser( const TQString & ) +TDMShutdownBase::verifySetUser( const TQString & ) { } @@ -241,7 +241,7 @@ doShutdown( int type, const char *os ) -KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) +TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) : inherited( _uid, _parent ) { setCaption(i18n("Shutdown TDE")); @@ -254,11 +254,11 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) hlay->addWidget( howGroup, 0, AlignTop ); TQRadioButton *rb; - rb = new KDMRadioButton( i18n("&Turn off computer"), howGroup ); + rb = new TDMRadioButton( i18n("&Turn off computer"), howGroup ); rb->setChecked( true ); rb->setFocus(); - restart_rb = new KDMRadioButton( i18n("&Restart computer"), howGroup ); + restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup ); connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); @@ -337,7 +337,7 @@ get_date( const char *str ) } void -KDMShutdown::accept() +TDMShutdown::accept() { if (le_start->text() == "0" || le_start->text() == "now") sch_st = time( 0 ); @@ -362,20 +362,20 @@ KDMShutdown::accept() } void -KDMShutdown::slotTargetChanged() +TDMShutdown::slotTargetChanged() { restart_rb->setChecked( true ); } void -KDMShutdown::slotWhenChanged() +TDMShutdown::slotWhenChanged() { doesNuke = cb_force->isChecked(); updateNeedRoot(); } void -KDMShutdown::accepted() +TDMShutdown::accepted() { GSet( 1 ); GSendInt( G_Shutdown ); @@ -392,7 +392,7 @@ KDMShutdown::accepted() } void -KDMShutdown::scheduleShutdown( TQWidget *_parent ) +TDMShutdown::scheduleShutdown( TQWidget *_parent ) { GSet( 1 ); GSendInt( G_QueryShutdown ); @@ -405,7 +405,7 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent ) GSet( 0 ); if (how) { int ret = - KDMCancelShutdown( how, start, timeout, force, uid, os, + TDMCancelShutdown( how, start, timeout, force, uid, os, _parent ).exec(); if (!ret) return; @@ -415,23 +415,23 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent ) uid = -1; if (os) free( os ); - KDMShutdown( uid, _parent ).exec(); + TDMShutdown( uid, _parent ).exec(); } -KDMRadioButton::KDMRadioButton( const TQString &label, TQWidget *parent ) +TDMRadioButton::TDMRadioButton( const TQString &label, TQWidget *parent ) : inherited( label, parent ) { } void -KDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * ) +TDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * ) { emit doubleClicked(); } -KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item, +TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name ) : inherited( item, parent, name ) @@ -442,31 +442,31 @@ KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item, connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); } -void KDMDelayedPushButton::setPopup( TQPopupMenu *p ) +void TDMDelayedPushButton::setPopup( TQPopupMenu *p ) { pop = p; setIsMenuButton( p != 0 ); } -void KDMDelayedPushButton::slotPressed() +void TDMDelayedPushButton::slotPressed() { if (pop) popt.start( TQApplication::startDragTime() ); } -void KDMDelayedPushButton::slotReleased() +void TDMDelayedPushButton::slotReleased() { popt.stop(); } -void KDMDelayedPushButton::slotTimeout() +void TDMDelayedPushButton::slotTimeout() { popt.stop(); pop->popup( mapToGlobal( rect().bottomLeft() ) ); setDown( false ); } -KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) +TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) : inherited( _parent ) , targetList( 0 ) { @@ -540,7 +540,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); hbuttonbox2->setAlignment( Qt::AlignRight ); - // Back to kdm + // Back to tdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); hbuttonbox2->addWidget( btnBack ); connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); @@ -556,7 +556,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) // we need to set the minimum size for the logout box, since it // gets too small if there all options are not available TQLabel *icon = new TQLabel( lfrm ); - icon->setPixmap( TQPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) ); + icon->setPixmap( TQPixmap( locate( "data", "tdm/pics/shutdown.jpg" ) ) ); TQVBoxLayout *iconlay = new TQVBoxLayout( lfrm ); iconlay->addWidget( icon ); @@ -571,8 +571,8 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) buttonlay->addSpacing( KDialog::spacingHint() ); - KDMDelayedPushButton *btnReboot = new - KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); + TDMDelayedPushButton *btnReboot = new + TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); buttonlay->addWidget( btnReboot ); connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) ); @@ -619,63 +619,63 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) } -KDMSlimShutdown::~KDMSlimShutdown() +TDMSlimShutdown::~TDMSlimShutdown() { freeStrArr( targetList ); } void -KDMSlimShutdown::slotSched() +TDMSlimShutdown::slotSched() { reject(); - KDMShutdown::scheduleShutdown(); + TDMShutdown::scheduleShutdown(); } void -KDMSlimShutdown::slotHalt() +TDMSlimShutdown::slotHalt() { if (checkShutdown( SHUT_HALT, 0 )) doShutdown( SHUT_HALT, 0 ); } void -KDMSlimShutdown::slotReboot() +TDMSlimShutdown::slotReboot() { if (checkShutdown( SHUT_REBOOT, 0 )) doShutdown( SHUT_REBOOT, 0 ); } void -KDMSlimShutdown::slotReboot( int opt ) +TDMSlimShutdown::slotReboot( int opt ) { if (checkShutdown( SHUT_REBOOT, targetList[opt] )) doShutdown( SHUT_REBOOT, targetList[opt] ); } bool -KDMSlimShutdown::checkShutdown( int type, const char *os ) +TDMSlimShutdown::checkShutdown( int type, const char *os ) { reject(); dpySpec *sess = fetchSessions( lstRemote | lstTTY ); if (!sess && _allowShutdown != SHUT_ROOT) return true; - int ret = KDMConfShutdown( -1, sess, type, os ).exec(); + int ret = TDMConfShutdown( -1, sess, type, os ).exec(); disposeSessions( sess ); if (ret == Schedule) { - KDMShutdown::scheduleShutdown(); + TDMShutdown::scheduleShutdown(); return false; } return ret; } void -KDMSlimShutdown::externShutdown( int type, const char *os, int uid ) +TDMSlimShutdown::externShutdown( int type, const char *os, int uid ) { dpySpec *sess = fetchSessions( lstRemote | lstTTY ); - int ret = KDMConfShutdown( uid, sess, type, os ).exec(); + int ret = TDMConfShutdown( uid, sess, type, os ).exec(); disposeSessions( sess ); if (ret == Schedule) - KDMShutdown( uid ).exec(); + TDMShutdown( uid ).exec(); else if (ret) doShutdown( type, os ); } @@ -804,7 +804,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e ) -KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os, +TDMConfShutdown::TDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os, TQWidget *_parent ) : inherited( _uid, _parent ) { @@ -863,7 +863,7 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char } -KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout, +TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout, int force, int uid, const char *os, TQWidget *_parent ) : inherited( -1, _parent ) @@ -922,4 +922,4 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout, complete( 0 ); } -#include "kdmshutdown.moc" +#include "tdmshutdown.moc" diff --git a/kdm/kfrontend/kdmshutdown.h b/kdm/kfrontend/kdmshutdown.h index 18fda2e9a..6a2ee3a70 100644 --- a/kdm/kfrontend/kdmshutdown.h +++ b/kdm/kfrontend/kdmshutdown.h @@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMSHUTDOWN_H -#define KDMSHUTDOWN_H +#ifndef TDMSHUTDOWN_H +#define TDMSHUTDOWN_H -#include "kdmconfig.h" // for HAVE_VTS +#include "tdmconfig.h" // for HAVE_VTS #include "kgverify.h" #include <kpushbutton.h> @@ -45,13 +45,13 @@ class TQLineEdit; enum { Authed = TQDialog::Accepted + 1, Schedule }; -class KDMShutdownBase : public FDialog, public KGVerifyHandler { +class TDMShutdownBase : public FDialog, public KGVerifyHandler { Q_OBJECT typedef FDialog inherited; public: - KDMShutdownBase( int _uid, TQWidget *_parent ); - virtual ~KDMShutdownBase(); + TDMShutdownBase( int _uid, TQWidget *_parent ); + virtual ~TDMShutdownBase(); protected slots: virtual void accept(); @@ -93,12 +93,12 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler { }; -class KDMShutdown : public KDMShutdownBase { +class TDMShutdown : public TDMShutdownBase { Q_OBJECT - typedef KDMShutdownBase inherited; + typedef TDMShutdownBase inherited; public: - KDMShutdown( int _uid, TQWidget *_parent = 0 ); + TDMShutdown( int _uid, TQWidget *_parent = 0 ); static void scheduleShutdown( TQWidget *_parent = 0 ); protected slots: @@ -123,12 +123,12 @@ class KDMShutdown : public KDMShutdownBase { }; -class KDMRadioButton : public TQRadioButton { +class TDMRadioButton : public TQRadioButton { Q_OBJECT typedef TQRadioButton inherited; public: - KDMRadioButton( const TQString &label, TQWidget *parent ); + TDMRadioButton( const TQString &label, TQWidget *parent ); private: virtual void mouseDoubleClickEvent( TQMouseEvent * ); @@ -138,12 +138,12 @@ class KDMRadioButton : public TQRadioButton { }; -class KDMDelayedPushButton : public KPushButton { +class TDMDelayedPushButton : public KPushButton { Q_OBJECT typedef KPushButton inherited; public: - KDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 ); + TDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 ); void setPopup( TQPopupMenu *pop ); private slots: @@ -156,13 +156,13 @@ class KDMDelayedPushButton : public KPushButton { TQTimer popt; }; -class KDMSlimShutdown : public FDialog { +class TDMSlimShutdown : public FDialog { Q_OBJECT typedef FDialog inherited; public: - KDMSlimShutdown( TQWidget *_parent = 0 ); - ~KDMSlimShutdown(); + TDMSlimShutdown( TQWidget *_parent = 0 ); + ~TDMSlimShutdown(); static void externShutdown( int type, const char *os, int uid ); private slots: @@ -177,21 +177,21 @@ class KDMSlimShutdown : public FDialog { }; -class KDMConfShutdown : public KDMShutdownBase { +class TDMConfShutdown : public TDMShutdownBase { Q_OBJECT - typedef KDMShutdownBase inherited; + typedef TDMShutdownBase inherited; public: - KDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os, + TDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os, TQWidget *_parent = 0 ); }; -class KDMCancelShutdown : public KDMShutdownBase { +class TDMCancelShutdown : public TDMShutdownBase { Q_OBJECT - typedef KDMShutdownBase inherited; + typedef TDMShutdownBase inherited; public: - KDMCancelShutdown( int how, int start, int timeout, int force, int uid, + TDMCancelShutdown( int how, int start, int timeout, int force, int uid, const char *os, TQWidget *_parent ); }; @@ -237,4 +237,4 @@ class FlatButton : public TQToolButton }; -#endif /* KDMSHUTDOWN_H */ +#endif /* TDMSHUTDOWN_H */ diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index f662ae1c2..98b5773c2 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kfdialog.h" -#include "kdmconfig.h" +#include "tdmconfig.h" #include <klocale.h> #include <kpushbutton.h> @@ -61,7 +61,7 @@ FDialog::FDialog( TQWidget *parent, bool framed ) } else winFrame = 0; - setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); + setCaption(TDM_LOGIN_SCREEN_BASE_TITLE); if (framed) { if (m_wmTitle) setFixedSize(sizeHint()); @@ -158,11 +158,11 @@ FDialog::box( TQWidget *parent, TQMessageBox::Icon type, const TQString &text ) KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text ) : inherited( parent, !is_themed ) { - if (type == TQMessageBox::NoIcon) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); - if (type == TQMessageBox::Question) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question")); - if (type == TQMessageBox::Information) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information")); - if (type == TQMessageBox::Warning) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning")); - if (type == TQMessageBox::Critical) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error")); + if (type == TQMessageBox::NoIcon) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE); + if (type == TQMessageBox::Question) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question")); + if (type == TQMessageBox::Information) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information")); + if (type == TQMessageBox::Warning) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning")); + if (type == TQMessageBox::Critical) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error")); TQLabel *label1 = new TQLabel( this ); label1->setPixmap( TQMessageBox::standardIcon( type ) ); diff --git a/kdm/kfrontend/kfdialog.h b/kdm/kfrontend/kfdialog.h index 3537c7b57..851d9a2db 100644 --- a/kdm/kfrontend/kfdialog.h +++ b/kdm/kfrontend/kfdialog.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#define KDM_LOGIN_SCREEN_BASE_TITLE i18n("Login to TDE") +#define TDM_LOGIN_SCREEN_BASE_TITLE i18n("Login to TDE") #ifndef FDIALOG_H #define FDIALOG_H diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index f21741805..5ad52dda6 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <config.h> -#include "kdm_greet.h" -#include "kdmshutdown.h" -#include "kdmconfig.h" +#include "tdm_greet.h" +#include "tdmshutdown.h" +#include "tdmconfig.h" #include "kgapp.h" #include "kgreeter.h" #ifdef XDMCP @@ -179,7 +179,7 @@ checkSAK(GreeterApp* app) void kg_main( const char *argv0 ) { - static char *argv[] = { (char *)"kdmgreet", 0 }; + static char *argv[] = { (char *)"tdmgreet", 0 }; KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); kdDebug() << timestamp() << "start" << endl; @@ -327,7 +327,7 @@ kg_main( const char *argv0 ) if (cmd == G_ConfShutdown) { int how = GRecvInt(), uid = GRecvInt(); char *os = GRecvStr(); - KDMSlimShutdown::externShutdown( how, os, uid ); + TDMSlimShutdown::externShutdown( how, os, uid ); if (os) free( os ); GSendInt( G_Ready ); diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp index f4ed918c6..667eca8e1 100644 --- a/kdm/kfrontend/kgdialog.cpp +++ b/kdm/kfrontend/kgdialog.cpp @@ -1,6 +1,6 @@ /* -Base class for various kdm greeter dialogs +Base class for various tdm greeter dialogs Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "kgdialog.h" #include "kgverify.h" #include "kconsole.h" -#include "kdmshutdown.h" -#include "kdm_greet.h" +#include "tdmshutdown.h" +#include "tdm_greet.h" #include <klocale.h> #include <kiconloader.h> @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. KGDialog::KGDialog( bool themed ) : inherited( 0, !themed ) { -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE consoleView = _showLog ? new KConsole( this ) : 0; #endif @@ -171,7 +171,7 @@ KGDialog::slotConsole() if (sess) { if (verify) verify->suspend(); - int ret = KDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec(); + int ret = TDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec(); if (verify) verify->resume(); disposeSessions( sess ); @@ -194,11 +194,11 @@ KGDialog::slotShutdown( int id ) verify->suspend(); if (id < 0) { if (_scheduledSd == SHUT_ALWAYS) - KDMShutdown::scheduleShutdown( this ); + TDMShutdown::scheduleShutdown( this ); else - KDMSlimShutdown( this ).exec(); + TDMSlimShutdown( this ).exec(); } else - KDMSlimShutdown::externShutdown( id, 0, -1 ); + TDMSlimShutdown::externShutdown( id, 0, -1 ); if (verify) verify->resume(); } diff --git a/kdm/kfrontend/kgdialog.h b/kdm/kfrontend/kgdialog.h index 2c683760e..a902b6ff0 100644 --- a/kdm/kfrontend/kgdialog.h +++ b/kdm/kfrontend/kgdialog.h @@ -1,6 +1,6 @@ /* -Base class for various kdm greeter dialogs +Base class for various tdm greeter dialogs Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> @@ -26,9 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef KGDIALOG_H #define KGDIALOG_H -#include <config.h> // for WITH_KDM_XCONSOLE +#include <config.h> // for WITH_TDM_XCONSOLE -#include "kdmconfig.h" +#include "tdmconfig.h" #include "kfdialog.h" class TQPopupMenu; @@ -67,7 +67,7 @@ class KGDialog : public FDialog { bool needSep; TQPopupMenu *optMenu; KGVerify *verify; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE KConsole *consoleView; #endif diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index 5877cb6c7..ee1bf3e72 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -1,6 +1,6 @@ /* -Greeter widget for kdm +Greeter widget for tdm Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> @@ -24,13 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "kgreeter.h" #include "kconsole.h" -#include "kdmconfig.h" -#include "kdmclock.h" -#include "kdm_greet.h" -#include "kdmadmindialog.h" -#include "themer/kdmthemer.h" -#include "themer/kdmitem.h" -#include "themer/kdmlabel.h" +#include "tdmconfig.h" +#include "tdmclock.h" +#include "tdm_greet.h" +#include "tdmadmindialog.h" +#include "themer/tdmthemer.h" +#include "themer/tdmitem.h" +#include "themer/tdmlabel.h" #include <kapplication.h> #include <klocale.h> @@ -86,9 +86,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <X11/Xlib.h> -#define FIFO_DIR "/tmp/ksocket-global/kdm" -#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1" -#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1" +#define FIFO_DIR "/tmp/ksocket-global/tdm" +#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1" +#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1" class UserListView : public KListView { public: @@ -872,7 +872,7 @@ KStdGreeter::KStdGreeter() , pixLabel( 0 ) { TQBoxLayout *main_box; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE if (consoleView) { TQBoxLayout *ex_box = new TQVBoxLayout( this, 10, 10 ); main_box = new TQHBoxLayout( ex_box, 10 ); @@ -952,7 +952,7 @@ KStdGreeter::KStdGreeter() TQWidget *prec; if (userView) prec = userView; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE else if (consoleView) prec = consoleView; #endif @@ -1060,10 +1060,10 @@ KThemedGreeter::KThemedGreeter() connect( themer, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotThemeActivated( const TQString & )) ); - console_rect = themer->findNode( "xconsole" ); // kdm ext + console_rect = themer->findNode( "xconsole" ); // tdm ext userlist_rect = themer->findNode( "userlist" ); caps_warning = themer->findNode( "caps-lock-warning" ); - xauth_warning = themer->findNode( "xauth-warning" ); // kdm ext + xauth_warning = themer->findNode( "xauth-warning" ); // tdm ext pam_error = themer->findNode( "pam-error" ); timed_label = themer->findNode( "timed-label" ); if (pam_error && pam_error->isA( "KdmLabel" )) @@ -1075,7 +1075,7 @@ KThemedGreeter::KThemedGreeter() if ((itm = themer->findNode( "language_button" ))) // not implemented yet itm->hide( true ); -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE if (console_rect) { if (consoleView) console_rect->setWidget( consoleView ); @@ -1097,7 +1097,7 @@ KThemedGreeter::KThemedGreeter() TQWidget *prec; if (userView) prec = userView; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE else if (consoleView) prec = consoleView; #endif @@ -1268,7 +1268,7 @@ KThemedGreeter::keyPressEvent( TQKeyEvent *e ) void KThemedGreeter::slotAskAdminPassword() { - KDMAdmin k(curUser, this); + TDMAdmin k(curUser, this); if (k.exec()) { GSendInt(G_Ready); hide(); diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h index 8ec8dd9c1..0de48a21d 100644 --- a/kdm/kfrontend/kgreeter.h +++ b/kdm/kfrontend/kgreeter.h @@ -1,6 +1,6 @@ /* -Greeter widget for kdm +Greeter widget for tdm Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index 73ec34456..ec0bfae6c 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -1,6 +1,6 @@ /* -Shell for kdm conversation plugins +Shell for tdm conversation plugins Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> @@ -25,11 +25,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <config.h> #include "kgverify.h" -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" -#include "themer/kdmthemer.h" -#include "themer/kdmitem.h" +#include "themer/tdmthemer.h" +#include "themer/tdmitem.h" #include <kapplication.h> #include <klocale.h> @@ -461,7 +461,7 @@ KGVerify::VErrBox( TQWidget *parent, const TQString &user, const char *msg ) if (!msg) { mesg = i18n("A critical error occurred.\n" - "Please look at KDM's logfile(s) for more information\n" + "Please look at TDM's logfile(s) for more information\n" "or contact your system administrator."); icon = errorbox; } else { diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h index 41451d800..44fab973a 100644 --- a/kdm/kfrontend/kgverify.h +++ b/kdm/kfrontend/kgverify.h @@ -1,6 +1,6 @@ /* -Shell for kdm conversation plugins +Shell for tdm conversation plugins Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp index 7d231948f..b51367485 100644 --- a/kdm/kfrontend/krootimage.cpp +++ b/kdm/kfrontend/krootimage.cpp @@ -35,7 +35,7 @@ Boston, MA 02110-1301, USA. #include <stdlib.h> static const char description[] = - I18N_NOOP( "Fancy desktop background for kdm" ); + I18N_NOOP( "Fancy desktop background for tdm" ); static const char version[] = "v2.0"; diff --git a/kdm/kfrontend/krootimage.h b/kdm/kfrontend/krootimage.h index 3168994ba..e46190116 100644 --- a/kdm/kfrontend/krootimage.h +++ b/kdm/kfrontend/krootimage.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KDMDESKTOP_H__ -#define __KDMDESKTOP_H__ +#ifndef __TDMDESKTOP_H__ +#define __TDMDESKTOP_H__ #include <kapplication.h> diff --git a/kdm/kfrontend/pics/CMakeLists.txt b/kdm/kfrontend/pics/CMakeLists.txt index 790dc06ce..e1b61b4f8 100644 --- a/kdm/kfrontend/pics/CMakeLists.txt +++ b/kdm/kfrontend/pics/CMakeLists.txt @@ -11,8 +11,8 @@ install( FILES kdelogo.png kdelogo-crystal.png shutdown.jpg - DESTINATION ${DATA_INSTALL_DIR}/kdm/pics ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/pics ) install( FILES default1.png default2.png default3.png root1.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/pics/users ) diff --git a/kdm/kfrontend/pics/Makefile.am b/kdm/kfrontend/pics/Makefile.am index d6b8957e8..9ba04536e 100644 --- a/kdm/kfrontend/pics/Makefile.am +++ b/kdm/kfrontend/pics/Makefile.am @@ -1,5 +1,5 @@ -picsdir = $(kde_datadir)/kdm/pics +picsdir = $(kde_datadir)/tdm/pics pics_DATA = kdelogo.png kdelogo-crystal.png shutdown.jpg usersdir = $(picsdir)/users diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc index edf346229..396fa1627 100644 --- a/kdm/kfrontend/sakdlg.cc +++ b/kdm/kfrontend/sakdlg.cc @@ -73,9 +73,9 @@ # define AF_LOCAL AF_UNIX #endif -#define FIFO_DIR "/tmp/ksocket-global/kdm" -#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1" -#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1" +#define FIFO_DIR "/tmp/ksocket-global/tdm" +#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1" +#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1" bool trinity_desktop_lock_use_system_modal_dialogs = TRUE; extern bool trinity_desktop_lock_use_sak; @@ -94,7 +94,7 @@ SAKDlg::SAKDlg(TQWidget *parent) kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); } - setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); + setCaption(TDM_LOGIN_SCREEN_BASE_TITLE); frame = new TQFrame( this ); if (trinity_desktop_lock_use_system_modal_dialogs) @@ -125,7 +125,7 @@ SAKDlg::SAKDlg(TQWidget *parent) installEventFilter(this); mSAKProcess = new KProcess; - *mSAKProcess << "kdmtsak" << "dm"; + *mSAKProcess << "tdmtsak" << "dm"; connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); mSAKProcess->start(); diff --git a/kdm/kfrontend/sessions/CMakeLists.txt b/kdm/kfrontend/sessions/CMakeLists.txt index 9979d3a96..780963bd4 100644 --- a/kdm/kfrontend/sessions/CMakeLists.txt +++ b/kdm/kfrontend/sessions/CMakeLists.txt @@ -26,4 +26,4 @@ install( FILES twm.desktop ude.desktop vtwm.desktop w9wm.desktop waimea.desktop wm2.desktop wmaker.desktop xfce.desktop xfce4.desktop - DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/sessions ) diff --git a/kdm/kfrontend/sessions/Makefile.am b/kdm/kfrontend/sessions/Makefile.am index 490d9e37e..a29872441 100644 --- a/kdm/kfrontend/sessions/Makefile.am +++ b/kdm/kfrontend/sessions/Makefile.am @@ -1,4 +1,4 @@ -sessionsdir = $(kde_datadir)/kdm/sessions +sessionsdir = $(kde_datadir)/tdm/sessions sessions_DATA = \ admin.desktop tde.desktop gnome.desktop \ 9wm.desktop \ diff --git a/kdm/kfrontend/themer/CMakeLists.txt b/kdm/kfrontend/themer/CMakeLists.txt index ff65734af..fc0b80fc3 100644 --- a/kdm/kfrontend/themer/CMakeLists.txt +++ b/kdm/kfrontend/themer/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdm/kfrontend - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdm/kfrontend + ${CMAKE_SOURCE_DIR}/tdmlib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -27,15 +27,15 @@ link_directories( ##### config.ci (generated) ##################### add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) -set_property( SOURCE kdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def ) +set_property( SOURCE tdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) -##### kdmthemer (static) ######################## +##### tdmthemer (static) ######################## -tde_add_library( kdmthemer STATIC_PIC AUTOMOC +tde_add_library( tdmthemer STATIC_PIC AUTOMOC SOURCES - kdmthemer.cpp kdmitem.cpp kdmpixmap.cpp - kdmrect.cpp kdmlabel.cpp kdmlayout.cpp + tdmthemer.cpp tdmitem.cpp tdmpixmap.cpp + tdmrect.cpp tdmlabel.cpp tdmlayout.cpp ) diff --git a/kdm/kfrontend/themer/Makefile.am b/kdm/kfrontend/themer/Makefile.am index 7f6eb5701..f736795d6 100644 --- a/kdm/kfrontend/themer/Makefile.am +++ b/kdm/kfrontend/themer/Makefile.am @@ -1,16 +1,16 @@ AM_CPPFLAGS = -I$(srcdir)/../../backend -I$(srcdir)/.. -I../.. \ - -I$(top_srcdir)/kdmlib \ + -I$(top_srcdir)/tdmlib \ $(all_includes) -noinst_LIBRARIES = libkdmthemer.a -libkdmthemer_a_SOURCES = \ - kdmthemer.cpp \ - kdmitem.cpp \ - kdmpixmap.cpp \ - kdmrect.cpp \ - kdmlabel.cpp \ - kdmlayout.cpp +noinst_LIBRARIES = libtdmthemer.a +libtdmthemer_a_SOURCES = \ + tdmthemer.cpp \ + tdmitem.cpp \ + tdmpixmap.cpp \ + tdmrect.cpp \ + tdmlabel.cpp \ + tdmlayout.cpp METASOURCES = AUTO -libkdmthemer_a_COMPILE_FIRST = ../../config.ci +libtdmthemer_a_COMPILE_FIRST = ../../config.ci diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 1c859d101..8cf126b66 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -25,9 +25,9 @@ // #define DRAW_OUTLINE 1 // for debugging only -#include "kdmitem.h" -#include "kdmlayout.h" -#include "kdmconfig.h" +#include "tdmitem.h" +#include "tdmlayout.h" +#include "tdmconfig.h" #include <kglobal.h> #include <kdebug.h> @@ -654,4 +654,4 @@ KdmItem::parentWidget() const return ((KdmItem*)parent())->parentWidget(); } -#include "kdmitem.moc" +#include "tdmitem.moc" diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 230ed71c4..27158a7fd 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMITEM_H -#define KDMITEM_H +#ifndef TDMITEM_H +#define TDMITEM_H #include <tqobject.h> #include <tqvaluelist.h> @@ -35,7 +35,7 @@ class TQPainter; class TQLayoutItem; /** class KdmItem - * @short Base class for every kdmthemes' element. + * @short Base class for every tdmthemes' element. * * This class provides methods for arranging it and its children to the * screen (see note below), painting the whole area or a sub-region using diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index 0eab99c30..5239d48dc 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -20,8 +20,8 @@ */ #include <config.h> -#include "kdmlabel.h" -#include "kdmconfig.h" +#include "tdmlabel.h" +#include "tdmconfig.h" #include "../kgreeter.h" #include <kglobal.h> @@ -273,4 +273,4 @@ KdmLabel::lookupText( const TQString &t ) return KMacroExpander::expandMacros( text, m ); } -#include "kdmlabel.moc" +#include "tdmlabel.moc" diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h index 1ec2f88ec..8b955fca5 100644 --- a/kdm/kfrontend/themer/kdmlabel.h +++ b/kdm/kfrontend/themer/kdmlabel.h @@ -22,7 +22,7 @@ #ifndef KDELABEL_H #define KDELABEL_H -#include "kdmitem.h" +#include "tdmitem.h" #include <tqcolor.h> #include <tqfont.h> diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp index 093d450fc..9a277a7a3 100644 --- a/kdm/kfrontend/themer/kdmlayout.cpp +++ b/kdm/kfrontend/themer/kdmlayout.cpp @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmlayout.h" -#include "kdmconfig.h" -#include "kdmitem.h" +#include "tdmlayout.h" +#include "tdmconfig.h" +#include "tdmitem.h" #include <kdebug.h> diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h index 4c73e9a1b..c147fd329 100644 --- a/kdm/kfrontend/themer/kdmlayout.h +++ b/kdm/kfrontend/themer/kdmlayout.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMLAYOUT_H -#define KDMLAYOUT_H +#ifndef TDMLAYOUT_H +#define TDMLAYOUT_H /** * this is a container for a lot of other stuff diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index 8020bd1e1..7a8d1a3d2 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -21,8 +21,8 @@ #include <config.h> -#include "kdmpixmap.h" -#include <kdmconfig.h> +#include "tdmpixmap.h" +#include <tdmconfig.h> #include <kimageeffect.h> #ifdef HAVE_LIBART @@ -68,10 +68,10 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name ) parseColor( el.attribute( "tint", "#ffffff" ), pixmap.normal.tint ); pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat(); - if (el.attribute( "file", "" ) == "@@@KDMBACKGROUND@@@") { + if (el.attribute( "file", "" ) == "@@@TDMBACKGROUND@@@") { if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Software blend only (no compositing support) - // Use the preset KDM background... + // Use the preset TDM background... KStandardDirs *m_pDirs = KGlobal::dirs(); KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) ); config->setGroup("Desktop0"); @@ -337,4 +337,4 @@ KdmPixmap::statusChanged() needUpdate(); } -#include "kdmpixmap.moc" +#include "tdmpixmap.moc" diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h index a12c9fea4..faa71a034 100644 --- a/kdm/kfrontend/themer/kdmpixmap.h +++ b/kdm/kfrontend/themer/kdmpixmap.h @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMPIXMAP_H -#define KDMPIXMAP_H +#ifndef TDMPIXMAP_H +#define TDMPIXMAP_H -#include "kdmitem.h" +#include "tdmitem.h" //#include <tqrect.h> #include <tqpixmap.h> diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp index 1db128da0..9056a513c 100644 --- a/kdm/kfrontend/themer/kdmrect.cpp +++ b/kdm/kfrontend/themer/kdmrect.cpp @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmrect.h" -#include "kdmthemer.h" -#include "kdmconfig.h" +#include "tdmrect.h" +#include "tdmthemer.h" +#include "tdmconfig.h" #include <kimageeffect.h> #include <kdebug.h> @@ -178,4 +178,4 @@ KdmRect::setWidget( TQWidget *widget ) //setAttribs( widget ); } -#include "kdmrect.moc" +#include "tdmrect.moc" diff --git a/kdm/kfrontend/themer/kdmrect.h b/kdm/kfrontend/themer/kdmrect.h index a505e1921..6dfdc126a 100644 --- a/kdm/kfrontend/themer/kdmrect.h +++ b/kdm/kfrontend/themer/kdmrect.h @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMRECT_H -#define KDMRECT_H +#ifndef TDMRECT_H +#define TDMRECT_H -#include "kdmitem.h" +#include "tdmitem.h" #include <tqcolor.h> #include <tqfont.h> diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index 39a1abe81..d2dc77935 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmthemer.h" -#include "kdmitem.h" -#include "kdmpixmap.h" -#include "kdmrect.h" -#include "kdmlabel.h" +#include "tdmthemer.h" +#include "tdmitem.h" +#include "tdmpixmap.h" +#include "tdmrect.h" +#include "tdmlabel.h" -#include <kdmconfig.h> +#include <tdmconfig.h> #include <kfdialog.h> #include <kiconloader.h> @@ -76,7 +76,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget return; } // Set the root (screen) item - rootItem = new KdmRect( parent, TQDomNode(), "kdm root" ); + rootItem = new KdmRect( parent, TQDomNode(), "tdm root" ); connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )), widget(), TQT_SLOT(update( int, int, int, int )) ); @@ -401,4 +401,4 @@ KdmThemer::slotPaintRoot() TQT_TQWIDGET(TQApplication::desktop()->screen())->erase(); } -#include "kdmthemer.moc" +#include "tdmthemer.moc" diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h index f9a0b1b6f..2b8865b4d 100644 --- a/kdm/kfrontend/themer/kdmthemer.h +++ b/kdm/kfrontend/themer/kdmthemer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMTHEMER_H -#define KDMTHEMER_H +#ifndef TDMTHEMER_H +#define TDMTHEMER_H #include <tqobject.h> #include <tqdom.h> diff --git a/kdm/kfrontend/themes/circles/CMakeLists.txt b/kdm/kfrontend/themes/circles/CMakeLists.txt index 91396000b..9122c13ea 100644 --- a/kdm/kfrontend/themes/circles/CMakeLists.txt +++ b/kdm/kfrontend/themes/circles/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES GdmGreeterTheme.desktop circles.xml background.svg flower.png help.png options.png screenshot.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/circles ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/circles ) diff --git a/kdm/kfrontend/themes/circles/Makefile.am b/kdm/kfrontend/themes/circles/Makefile.am index 97ad04b6a..d88c407c2 100644 --- a/kdm/kfrontend/themes/circles/Makefile.am +++ b/kdm/kfrontend/themes/circles/Makefile.am @@ -1,4 +1,4 @@ -circlesdir = $(kde_datadir)/kdm/themes/circles +circlesdir = $(kde_datadir)/tdm/themes/circles circles_DATA = \ GdmGreeterTheme.desktop \ circles.xml \ diff --git a/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt b/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt index 81b5fe7de..bf9f738a0 100644 --- a/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt +++ b/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt @@ -13,4 +13,4 @@ install( FILES Dialog.png enter_normal.png enter_over.png enter_pressed.png enterprise.xml GdmGreeterTheme.desktop preview.png system_normal.png system_over.png system_pressed.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/o2_enterprise ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/o2_enterprise ) diff --git a/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop b/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop index d50678db4..10ce5cc52 100644 --- a/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop +++ b/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop @@ -5,6 +5,6 @@ Encoding=UTF-8 Greeter=enterprise.xml Name=O2 Enterprise -Description=A sleek and professional looking KDM theme for Trinity +Description=A sleek and professional looking TDM theme for Trinity Author=Ken Wimer (wimer@kde.org) and Timothy Pearson (kb9vqf@pearsoncomputing.net) Screenshot=preview.png diff --git a/kdm/kfrontend/themes/o2_enterprise/Makefile.am b/kdm/kfrontend/themes/o2_enterprise/Makefile.am index 02b0dee99..078e370a5 100644 --- a/kdm/kfrontend/themes/o2_enterprise/Makefile.am +++ b/kdm/kfrontend/themes/o2_enterprise/Makefile.am @@ -1,4 +1,4 @@ -o2_enterprisedir = $(kde_datadir)/kdm/themes/o2_enterprise +o2_enterprisedir = $(kde_datadir)/tdm/themes/o2_enterprise o2_enterprise_DATA = \ Dialog.png \ enter_normal.png \ diff --git a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml index 42e37f890..cf8aecd32 100644 --- a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml +++ b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml @@ -2,7 +2,7 @@ <!DOCTYPE greeter SYSTEM "greeter.dtd"> <greeter> <item type="pixmap" > - <normal file="@@@KDMBACKGROUND@@@" /> + <normal file="@@@TDMBACKGROUND@@@" /> <pos width="100%" x="0" y="0" height="100%" /> </item> <item type="pixmap" > |