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

[citadel.git] / textclient / citadel_ipc.c

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index e5788ad4c6b5152e25ca7f4b09d9c718b9cb6724..007f8410f254f1e79e9efd7edf2b58746175de60 100644 (file)
--- a/textclient/citadel_ipc.c
+++ b/textclient/citadel_ipc.c
@@ -488,11 +488,11 @@ int CtdlIPCGotoRoom(CtdlIPC * ipc, const char *room, const char *passwd, struct
                rret[0]->RRlastread = extract_long(cret, 6);
                rret[0]->RRismailbox = extract_int(cret, 7);
                rret[0]->RRaide = extract_int(cret, 8);
-               rret[0]->RRnewmail = extract_long(cret, 9);
+               // position 9 is no longer used
                rret[0]->RRfloor = extract_int(cret, 10);
                rret[0]->RRcurrentview = extract_int(cret, 11);
                rret[0]->RRdefaultview = extract_int(cret, 12);
-               /* position 13 is a trash folder flag ... irrelevant in this client */
+               // position 13 is a trash folder flag ... irrelevant in this client
                rret[0]->RRflags2 = extract_int(cret, 14);
        }
        else {
@@ -671,7 +671,7 @@ int CtdlIPCGetSingleMessage(CtdlIPC * ipc, long msgnum, int headers, int as_mime
                                        if (!strncasecmp(bbb, "Content-type:", 13)) {
                                                extract_token(mret[0]->content_type, bbb, 0, '\n', sizeof mret[0]->content_type);
                                                strcpy(mret[0]->content_type, &mret[0]->content_type[13]);
-                                               striplt(mret[0]->content_type);
+                                               string_trim(mret[0]->content_type);
 
                                                /* strip out ";charset=" portion.  FIXME do something with
                                                 * the charset (like... convert it) instead of just throwing
@@ -685,12 +685,12 @@ int CtdlIPCGetSingleMessage(CtdlIPC * ipc, long msgnum, int headers, int as_mime
                                        if (!strncasecmp(bbb, "X-Citadel-MSG4-Partnum:", 23)) {
                                                extract_token(mret[0]->mime_chosen, bbb, 0, '\n', sizeof mret[0]->mime_chosen);
                                                strcpy(mret[0]->mime_chosen, &mret[0]->mime_chosen[23]);
-                                               striplt(mret[0]->mime_chosen);
+                                               string_trim(mret[0]->mime_chosen);
                                        }
                                        if (!strncasecmp(bbb, "Content-transfer-encoding:", 26)) {
                                                extract_token(encoding, bbb, 0, '\n', sizeof encoding);
                                                strcpy(encoding, &encoding[26]);
-                                               striplt(encoding);
+                                               string_trim(encoding);
                                        }
                                        remove_token(bbb, 0, '\n');
                                } while ((bbb[0] != 0) && (bbb[0] != '\n'));
@@ -1672,7 +1672,7 @@ int CtdlIPCIdentifySoftware(CtdlIPC * ipc, int developerid, int clientid,
                developerid = 8;
                clientid = 0;
                revision = CLIENT_VERSION - 600;
-               software_name = "Citadel (libcitadel)";
+               software_name = "Citadel text client";
        }
        if (!hostname)
                return -2;