X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Ffe-common%2Fcore%2Fformats.c;h=983a849e04304c3f7e09135976ec5c1a06d35676;hp=6941391e78c6cb7b7bddfdcb4f1b142676139963;hb=d9991fbb54877db0079a065c9e590032464cf54b;hpb=b3282ad4fb6e35291f6628886dc5aee3c347f2f2

diff --git a/apps/irssi/src/fe-common/core/formats.c b/apps/irssi/src/fe-common/core/formats.c
index 6941391e..983a849e 100644
--- a/apps/irssi/src/fe-common/core/formats.c
+++ b/apps/irssi/src/fe-common/core/formats.c
@@ -38,7 +38,7 @@ static const char *format_fores = "kbgcrmyw";
 static const char *format_boldfores = "KBGCRMYW";
 
 static int signal_gui_print_text;
-static int hide_text_style, hide_server_tags, hide_mirc_colors;
+static int hide_text_style, hide_server_tags, hide_colors;
 
 static int timestamp_level;
 static int timestamp_timeout;
@@ -227,10 +227,8 @@ void format_read_arglist(va_list va, FORMAT_REC *format,
 		switch (format->paramtypes[num]) {
 		case FORMAT_STRING:
 			arglist[num] = (char *) va_arg(va, char *);
-			if (arglist[num] == NULL) {
-				g_warning("format_read_arglist(%s) : parameter %d is NULL", format->tag, num);
+			if (arglist[num] == NULL)
 				arglist[num] = "";
-			}
 			break;
 		case FORMAT_INT: {
 			int d = (int) va_arg(va, int);
@@ -980,9 +978,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 		case 3:
 			/* MIRC color */
 			get_mirc_color((const char **) &ptr,
-					hide_mirc_colors || hide_text_style ? NULL : &fgcolor,
-					hide_mirc_colors || hide_text_style ? NULL : &bgcolor);
-			if (!hide_mirc_colors && !hide_text_style)
+					hide_colors ? NULL : &fgcolor,
+					hide_colors ? NULL : &bgcolor);
+			if (!hide_colors)
 				flags |= GUI_PRINT_FLAG_MIRC_COLOR;
 			break;
 		case 4:
@@ -1079,9 +1077,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
 			/* ansi color code */
 			ptr = (char *)
 				get_ansi_color(theme, ptr,
-					       hide_text_style ? NULL : &fgcolor,
-					       hide_text_style ? NULL : &bgcolor,
-					       hide_text_style ? NULL : &flags);
+					       hide_colors ? NULL : &fgcolor,
+					       hide_colors ? NULL : &bgcolor,
+					       hide_colors ? NULL : &flags);
 			break;
 		}
 
@@ -1102,7 +1100,7 @@ static void read_settings(void)
 
 	hide_server_tags = settings_get_bool("hide_server_tags");
 	hide_text_style = settings_get_bool("hide_text_style");
-	hide_mirc_colors = settings_get_bool("hide_mirc_colors");
+	hide_colors = hide_text_style || settings_get_bool("hide_colors");
 }
 
 void formats_init(void)