From fa36c3f25d27eadec4ce1605790e519df6234e51 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 22 Jan 2012 00:32:11 -0600 Subject: [PATCH] Part 1 of 2 of kdm rename --- doc/ktalkd/index.docbook | 10 +++++----- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 2 +- filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp | 2 +- ktalkd/configure.in.in | 4 ++-- ktalkd/ktalkd/announce.cpp | 12 ++++++------ ktalkd/ktalkd/find_user.cpp | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/ktalkd/index.docbook b/doc/ktalkd/index.docbook index b35fa3d4..7a09ac2e 100644 --- a/doc/ktalkd/index.docbook +++ b/doc/ktalkd/index.docbook @@ -329,7 +329,7 @@ announcements? Because this would be security hole, with the current user detection. You can bypass the limitation by adding two lines in -xdm config files (which are the same as &kdm; ones). +xdm config files (which are the same as &tdm; ones). @@ -375,10 +375,10 @@ DisplayManager._0.reset: /etc/X11/xdm/Xreset -This will make &kdm; (or xdm) log +This will make &tdm; (or xdm) log the user into utmp, which is the right thing to do. It's not up to &konsole;, nor xterm, to log the user, but to -xdm and &kdm;, in my +xdm and &tdm;, in my opinion. However, this will not log the user as an X user when using startx... Any hint about that ? @@ -404,7 +404,7 @@ If you're running &Linux; 2.0.35, this is a known bug in the kernel, which doesn't let root read /proc. The solution is the same as in the previous question, provided that you run -&kdm; or xdm to log into X. Or +&tdm; or xdm to log into X. Or upgrade! @@ -413,7 +413,7 @@ Otherwise, this is normal. &ktalkd; can't find the user, as &kde; doesn't log him into utmp and the &Linux; based (/proc) detection is disabled. The solution is the same as in the previous question, provided that you run -kdm or xdm to log into X. Another +tdm or xdm to log into X. Another solution is to make sure you always have an xterm running. diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 57c96424..fcf691da 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -311,7 +311,7 @@ void KcmSambaConf::initAdvancedTab() icon = SmallIcon("fileprint"); else if (label == i18n("Logon")) - icon = SmallIcon("kdmconfig"); + icon = SmallIcon("tdmconfig"); else if (label == i18n("Protocol")) icon = SmallIcon("core"); diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 55a1983c..2604a34d 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -301,7 +301,7 @@ void ShareDlgImpl::initAdvancedTab() icon = SmallIcon("lock"); else if (label.lower() == "logon") - icon = SmallIcon("kdmconfig"); + icon = SmallIcon("tdmconfig"); else if (label.lower() == "protocol") icon = SmallIcon("core"); diff --git a/ktalkd/configure.in.in b/ktalkd/configure.in.in index 6557e9ff..969d80ee 100644 --- a/ktalkd/configure.in.in +++ b/ktalkd/configure.in.in @@ -8,8 +8,8 @@ if test -n "`echo $target_os | grep linux`" ; then if test -d /proc; then AC_DEFINE(PROC_FIND_USER, 1, [/proc exists]) -## Sufficient if all xdm and kdm would call sessreg to log the user into utmp - AC_DEFINE(UTMP_AND_PROC_FIND_USER, 1, [kdm/xmd log user]) +## Sufficient if all xdm and tdm would call sessreg to log the user into utmp + AC_DEFINE(UTMP_AND_PROC_FIND_USER, 1, [tdm/xmd log user]) ## Waiting for this, here is complement, looking for DISPLAY set in any process ## in /proc that the user owns diff --git a/ktalkd/ktalkd/announce.cpp b/ktalkd/ktalkd/announce.cpp index 73b72f30..6f69e3f8 100644 --- a/ktalkd/ktalkd/announce.cpp +++ b/ktalkd/ktalkd/announce.cpp @@ -72,7 +72,7 @@ #endif #endif -#define ktalkdmax(a,b) ( (a) > (b) ? (a) : (b) ) +#define ktaltdmax(a,b) ( (a) > (b) ? (a) : (b) ) #define N_LINES 5 /* @@ -383,17 +383,17 @@ void print_mesg(FILE * tf, NEW_CTL_MSG * request, const char * localclock = localtime( (const time_t *) &clock.tv_sec ); (void)snprintf(line_buf[i], N_CHARS, " "); sizes[i] = strlen(line_buf[i]); - max_size = ktalkdmax(max_size, sizes[i]); + max_size = ktaltdmax(max_size, sizes[i]); i++; (void)snprintf(line_buf[i], N_CHARS, Options.announce1, localclock->tm_hour , localclock->tm_min ); sizes[i] = strlen(line_buf[i]); - max_size = ktalkdmax(max_size, sizes[i]); + max_size = ktaltdmax(max_size, sizes[i]); i++; snprintf(buffer, N_CHARS, "%s@%s", request->l_name, remotename); snprintf(line_buf[i], N_CHARS, Options.announce2, buffer); sizes[i] = strlen(line_buf[i]); - max_size = ktalkdmax(max_size, sizes[i]); + max_size = ktaltdmax(max_size, sizes[i]); i++; if (!(strcmp(localname,remotename))) { @@ -403,12 +403,12 @@ void print_mesg(FILE * tf, NEW_CTL_MSG * request, const char * } sizes[i] = strlen(line_buf[i]); - max_size = ktalkdmax(max_size, sizes[i]); + max_size = ktaltdmax(max_size, sizes[i]); i++; (void)snprintf(line_buf[i], N_CHARS, " "); sizes[i] = strlen(line_buf[i]); sizes[i] = strlen(line_buf[i]); - max_size = ktalkdmax(max_size, sizes[i]); + max_size = ktaltdmax(max_size, sizes[i]); i++; bptr = big_buf; if (!force_no_sound) /* set if a X announce has been done */ diff --git a/ktalkd/ktalkd/find_user.cpp b/ktalkd/ktalkd/find_user.cpp index 3791d354..37b39428 100644 --- a/ktalkd/ktalkd/find_user.cpp +++ b/ktalkd/ktalkd/find_user.cpp @@ -99,7 +99,7 @@ char *get_display(pid_t pid) { return dpy; } -/* As utmp isn't reliable (neither xdm nor kdm logs into it ! :( ), +/* As utmp isn't reliable (neither xdm nor tdm logs into it ! :( ), we have to look at processes directly. /proc helps a lot, under linux. How to do it under other unixes ? */ #ifdef ALL_PROCESSES_AND_PROC_FIND_USER