* Revised status_line() display, it's much more compact now

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index cda555d3c0fe02b900720ca2b1da321ee9deec3e..6eb20860119b90bf09bab976abf941a1eaa4d3c6 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.87  2002/01/26 03:57:30  error
+ * Revised status_line() display, it's much more compact now
+
  Revision 590.86  2002/01/26 03:50:26  error
  * Better error reporting in connection_died(), kills curses before printing
    error message, prints last errno.
@@ -3238,4 +3241,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/screen.c b/citadel/screen.c
index 374210a4f9b716d9f18bbfa6a24435d2e2332f36..1cfcb9760441bd88973f64c5a999062c42f2997f 100644 (file)
--- a/citadel/screen.c
+++ b/citadel/screen.c
@@ -50,19 +50,18 @@ void status_line(const char *humannode, const char *bbs_city,
 {
 #ifdef HAVE_CURSES_H
        if (statuswindow) {
-               if (secure)
-                       sln_printf("Secure ");
-               else
-                       sln_printf("Not secure ");
-               waddch(statuswindow, ACS_VLINE);
-               waddch(statuswindow, ' ');
-               if (humannode && bbs_city)
-                       sln_printf("%s at %s ", humannode, bbs_city);
+               if (secure) {
+                       sln_printf("Encrypted ");
+                       waddch(statuswindow, ACS_VLINE);
+                       waddch(statuswindow, ' ');
+               }
                if (room_name)
-                       sln_printf("in %s ", room_name);
+                       sln_printf("%s on ", room_name);
+               if (humannode)
+                       sln_printf("%s ", humannode);
                if (newmailcount > -1) {
                        waddch(statuswindow, ACS_VLINE);
-                       sln_printf(" %d unread mail", newmailcount);
+                       sln_printf(" Mail: %d new ", newmailcount);
                }
                sln_printf("\n");
        }