* Minor cosmetic changes, extraneous double spaces etc.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3cb8947157a87e5a62fce6ab7cbe7986b89ea625..6dd99ed9d284eaf2eee351f97e701ffb2ec3c8d4 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 591.23  2002/05/14 01:27:18  error
+ * Minor cosmetic changes, extraneous double spaces etc.
+
  Revision 591.22  2002/05/14 01:15:54  error
  * Idle threshold on the who list is now customizable in the citadel.rc
 
@@ -3648,4 +3651,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 182491cf8583efcfbdce60a9455b93358c81c02f..eeccb3c61f92ab58eca71cf01499912ffe5e44cf 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -462,7 +462,10 @@ void dotgoto(char *towhere, int display_name, int fromungoto)
                newmailcount = extract_int(&aaa[4], 9);
                if (newmailcount > 0) {
                        color(BRIGHT_RED);
-                       scr_printf("*** You have new mail\n");
+                       scr_printf("*** You have %d new mail message%s\n",
+                                       newmailcount - oldmailcount,
+                                       (newmailcount - oldmailcount == 1) ?
+                                       "" : "s");
                        color(DIM_WHITE);
                }
                status_line(serv_info.serv_humannode, serv_info.serv_bbs_city,

diff --git a/citadel/citadel_decls.h b/citadel/citadel_decls.h
index 94f9d260d49b1d5c8d49ab0ff507ab784f7c65f0..ac29dcaf9e5d1d5818d73eedff1dc6408f385a1c 100644 (file)
--- a/citadel/citadel_decls.h
+++ b/citadel/citadel_decls.h
@@ -13,6 +13,7 @@ extern char have_xterm;
 extern char rc_username[32];
 extern char rc_password[32];
 extern char rc_floor_mode;
+extern int rc_idle_threshold;
 #ifdef HAVE_OPENSSL
 extern char rc_encrypt;                        /* from the citadel.rc file */
 extern char arg_encrypt;               /* from the command line */

diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index b5d867fe41753a6b139e1bfc851f93684ea93f46..49e24ea8b8da44f9bf17d2fa5d088db87a96aa93 100644 (file)
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -238,7 +238,7 @@ void page_user()
 
        /* old server -- use inline paging */
        if (serv_info.serv_paging_level == 0) {
-               newprompt("Message:  ", msg, 69);
+               newprompt("Message: ", msg, 69);
                snprintf(buf, sizeof buf, "SEXP %s|%s", touser, msg);
                serv_puts(buf);
                serv_gets(buf);

diff --git a/citadel/rooms.c b/citadel/rooms.c
index f17a70b413e6284b71855931b5efd28aab5cb572..c8b85869779c063898d515f6d14a87dcb4e4915a 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -986,9 +986,18 @@ void entroom(void)
 void readinfo(void)
 {                              /* read info file for current room */
        char cmd[SIZ];
+       char raide[64];
 
-       snprintf(cmd, sizeof cmd, "RINF");
-       serv_puts(cmd);
+       /* Name of currernt room aide */
+       serv_puts("GETA");
+       serv_gets(cmd);
+       if (cmd[0] == '2') {
+               safestrncpy(raide, &cmd[4], sizeof raide);
+               scr_printf("Room aide is %s.\n\n", raide);
+       } else {
+               strcpy(raide, "");
+
+       serv_puts("RINF");
        serv_gets(cmd);
 
        if (cmd[0] != '1') {
@@ -996,7 +1005,8 @@ void readinfo(void)
        }
 
        fmout(screenwidth, NULL, NULL,
-             ((userflags & US_PAGINATOR) ? 1 : 0), screenheight, 0, 1);
+             ((userflags & US_PAGINATOR) ? 1 : 0), screenheight, 
+             (*raide) ? 2 : 0, 1);
 }