diff -r 0df472b1b7ff -r 2a18ef3e5224 src/protocols/irc/cmds.c
--- a/src/protocols/irc/cmds.c	Mon Aug 25 00:39:39 2003 +0000
+++ b/src/protocols/irc/cmds.c	Mon Aug 25 02:49:42 2003 +0000
@@ -40,9 +40,9 @@
 
 	buf = g_strdup_printf(_("Unknown command: %s"), cmd);
 	if (gaim_conversation_get_type(convo) == GAIM_CONV_IM)
-		gaim_im_write(GAIM_IM(convo), "", buf, -1, WFLAG_SYSTEM|WFLAG_NOLOG, time(NULL));
+		gaim_im_write(GAIM_IM(convo), "", buf, -1, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
 	else
-		gaim_chat_write(GAIM_CHAT(convo), "", buf, WFLAG_SYSTEM|WFLAG_NOLOG, time(NULL));
+		gaim_chat_write(GAIM_CHAT(convo), "", buf, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
 	g_free(buf);
 
 	return 1;
@@ -139,13 +139,13 @@
 							"PART PING QUERY QUIT<BR>"
 							"QUOTE REMOVE TOPIC UMODE<BR>"
 							"VOICE DEVOICE WALLOPS WHOIS<BR>"),
-				WFLAG_NOLOG, time(NULL));
+				GAIM_MESSAGE_NO_LOG, time(NULL));
 	} else {
 		gaim_im_write(GAIM_IM(convo), "", _("<B>Supported IRC Commands:</B><BR>"
 						    "AWAY JOIN ME MODE<BR>"
 						    "MSG NICK OPERWALL PING<BR>"
 						    "QUERY QUIT QUOTE UMODE<BR>"
-						    "WALLOPS WHOIS"), -1, WFLAG_NOLOG, time(NULL));
+						    "WALLOPS WHOIS"), -1, GAIM_MESSAGE_NO_LOG, time(NULL));
 	}
 
 	return 0;
@@ -413,7 +413,7 @@
 		gc = gaim_account_get_connection(irc->account);
 		irc_cmd_privmsg(irc, cmd, target, args);
 		gaim_im_write(GAIM_IM(convo), gaim_connection_get_display_name(gc),
-			      args[1], -1, WFLAG_SEND, time(NULL));
+			      args[1], -1, GAIM_MESSAGE_SEND, time(NULL));
 	}
 
 	return 0;
@@ -459,7 +459,7 @@
 			buf = g_strdup_printf(_("current topic is: %s"), topic);
 		else
 			buf = g_strdup(_("No topic is set"));
-		gaim_chat_write(GAIM_CHAT(convo), target, buf, WFLAG_SYSTEM|WFLAG_NOLOG, time(NULL));
+		gaim_chat_write(GAIM_CHAT(convo), target, buf, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
 		g_free(buf);
 
 		return 0;