X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fcitadel.c;h=1fea75eb38842077722782d3919324e985b600e6;hb=HEAD;hp=453f21bea86c6bb36736150adc7236a3b99853f0;hpb=824659b91bb38193d9a977eae8a4c6113dfd4041;p=citadel.git

diff --git a/textclient/citadel.c b/textclient/citadel.c
index 453f21bea..b5682cfb2 100644
--- a/textclient/citadel.c
+++ b/textclient/citadel.c
@@ -2,13 +2,7 @@
 //
 // Copyright (c) 1987-2022 by the citadel.org team
 //
-// This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License version 3.
 
 #include "textclient.h"
 
@@ -58,6 +52,7 @@ int secure;			/* Set to nonzero when wire is encrypted */
 
 extern char instant_msgs;	/* instant messages waiting! */
 extern int rc_ansi_color;	/* ansi color value from citadel.rc */
+extern int rc_sixel;		/* sixel graphics value from citadel.rc */
 extern int next_lazy_cmd;
 
 CtdlIPC *ipc_for_signal_handlers;	/* KLUDGE cover your eyes */
@@ -78,12 +73,12 @@ void ctdl_logoff(char *file, int line, CtdlIPC * ipc, int code) {
 	}
 
 	// Shut down the server connection ... but not if the logoff code is 3,
- 	// because that means we're exiting because we already lost the server.
+	// because that means we're exiting because we already lost the server.
 	if (code != 3) {
 		CtdlIPCQuit(ipc);
 	}
 
- 	// now clean up various things
+	// now clean up various things
 	unlink(temp);
 	unlink(temp2);
 	nukedir(tempdir);
@@ -399,29 +394,27 @@ void dotgoto(CtdlIPC * ipc, char *towhere, int display_name, int fromungoto) {
 		readinfo(ipc);
 
 	/* check for newly arrived mail if we can   FIXME use BIFF command for this
-	if (newmailcount > 0) {
-		color(BRIGHT_RED);
-		if (newmailcount == 1) {
-			scr_printf("*** A new mail message has arrived.\n");
-		}
-		else {
-			scr_printf("*** %d new mail messages have arrived.\n", newmailcount);
-		}
-		color(DIM_WHITE);
-		if (!IsEmptyStr(rc_gotmail_cmd)) {
-			rv = system(rc_gotmail_cmd);
-			if (rv)
-				scr_printf("*** failed to check for mail calling %s Reason %d.\n", rc_gotmail_cmd, rv);
-		}
-	}
-	*/
+	   if (newmailcount > 0) {
+	   color(BRIGHT_RED);
+	   if (newmailcount == 1) {
+	   scr_printf("*** A new mail message has arrived.\n");
+	   }
+	   else {
+	   scr_printf("*** %d new mail messages have arrived.\n", newmailcount);
+	   }
+	   color(DIM_WHITE);
+	   if (!IsEmptyStr(rc_gotmail_cmd)) {
+	   rv = system(rc_gotmail_cmd);
+	   if (rv)
+	   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, 0);		// FIXME use BIFF
+		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, 0);	// FIXME use BIFF
 }
 
 
@@ -1039,7 +1032,7 @@ void get_serv_info(CtdlIPC * ipc, char *supplied_hostname) {
 	// 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 %s:%d", __FILE__ , __LINE__);
+		scr_printf("Error %s:%d", __FILE__, __LINE__);
 		logoff(ipc, 0);
 	}
 
@@ -1052,7 +1045,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 %s:%d", __FILE__ , __LINE__);
+		scr_printf("Error %s:%d", __FILE__, __LINE__);
 		logoff(ipc, 0);
 	}
 }