GOTO no longer counts newly arrived mail in the inbox. BIFF now does this.

[citadel.git] / textclient / citadel.c

diff --git a/textclient/citadel.c b/textclient/citadel.c
index fe5ffe7fb8b277c30db296bff95b2711c013460e..c5133b40038d16743ce85c667ffe45df2b95b2b0 100644 (file)
--- a/textclient/citadel.c
+++ b/textclient/citadel.c
@@ -262,7 +262,6 @@ char *pop_march(int desired_floor, struct march *_march) {
 void dotgoto(CtdlIPC * ipc, char *towhere, int display_name, int fromungoto) {
        char aaa[SIZ], bbb[SIZ];
        static long ls = 0L;
-       int newmailcount = 0;
        int partial_match, best_match;
        char from_floor;
        int ugpos = uglistsize;
@@ -405,8 +404,7 @@ void dotgoto(CtdlIPC * ipc, char *towhere, int display_name, int fromungoto) {
        if (room->RRinfoupdated > 0)
                readinfo(ipc);
 
-       /* check for newly arrived mail if we can */
-       newmailcount = room->RRnewmail;
+       /* check for newly arrived mail if we can   FIXME use BIFF command for this
        if (newmailcount > 0) {
                color(BRIGHT_RED);
                if (newmailcount == 1) {
@@ -422,12 +420,14 @@ void dotgoto(CtdlIPC * ipc, char *towhere, int display_name, int fromungoto) {
                                scr_printf("*** failed to check for mail calling %s Reason %d.\n", rc_gotmail_cmd, rv);
                }
        }
+       */
+
        free(room);
 
        if (screenwidth > 5)
                snprintf(&status_line[1], screenwidth - 1, "%s  |  %s  |  %s  |  %s  |  %d new mail  |",
                         (secure ? "Encrypted" : "Unencrypted"),
-                        ipc->ServInfo.humannode, ipc->ServInfo.site_location, room_name, newmailcount);
+                        ipc->ServInfo.humannode, ipc->ServInfo.site_location, room_name, 0);           // FIXME use BIFF
 }
 
 
@@ -1046,11 +1046,10 @@ void get_serv_info(CtdlIPC * ipc, char *supplied_hostname) {
                                /* Look up the , in the bible if you're confused */
                                (locate_host(ipc, buf), buf), buf);
 
-       /* Indicate to the server that we prefer to decode Base64 and
-        * quoted-printable on the client side.
-        */
+       // Indicate to the server that we prefer to decode Base64 and
+       // quoted-printable on the client side.
        if ((CtdlIPCSpecifyPreferredFormats(ipc, buf, "dont_decode") / 100) != 2) {
-               scr_printf("ERROR: Extremely old server; MSG4 framework not supported.\n");
+               scr_printf("Error %s:%d", __FILE__ , __LINE__);
                logoff(ipc, 0);
        }
 
@@ -1063,7 +1062,7 @@ void get_serv_info(CtdlIPC * ipc, char *supplied_hostname) {
         * the plain text when we have it available.
         */
        if ((CtdlIPCSpecifyPreferredFormats(ipc, buf, "text/plain|text/html|text/x-markdown") / 100) != 2) {
-               scr_printf("ERROR: Extremely old server; MSG4 framework not supported.\n");
+               scr_printf("Error %s:%d", __FILE__ , __LINE__);
                logoff(ipc, 0);
        }
 }