diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-22 00:32:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-22 00:32:11 -0600 |
| commit | fa36c3f25d27eadec4ce1605790e519df6234e51 (patch) | |
| tree | 1d227e9ba55bf08f9e4fcea2af38b3defdce6b64 /ktalkd | |
| parent | 9f97121b38893c64311d29529eb686126ac84bc1 (diff) | |
| download | tdenetwork-fa36c3f25d27eadec4ce1605790e519df6234e51.tar.gz tdenetwork-fa36c3f25d27eadec4ce1605790e519df6234e51.zip | |
Part 1 of 2 of kdm rename
Diffstat (limited to 'ktalkd')
| -rw-r--r-- | ktalkd/configure.in.in | 4 | ||||
| -rw-r--r-- | ktalkd/ktalkd/announce.cpp | 12 | ||||
| -rw-r--r-- | ktalkd/ktalkd/find_user.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
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 |