Index: src/protocols/irc/msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.33
diff -u -p -r1.33 msgs.c
--- src/protocols/irc/msgs.c	25 Jul 2004 17:52:22 -0000	1.33
+++ src/protocols/irc/msgs.c	27 Jul 2004 16:47:04 -0000
@@ -417,11 +417,14 @@ void irc_msg_endmotd(struct irc_conn *ir
 void irc_msg_nochan(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	GaimConnection *gc = gaim_account_get_connection(irc->account);
+	char *tmp;
 
 	if (gc == NULL || args == NULL || args[1] == NULL)
 		return;
 
-	gaim_notify_error(gc, NULL, _("No such channel"), args[1]);
+	tmp = g_markup_escape_text(args[1], strlen(args[1]));
+	gaim_notify_error(gc, NULL, _("No such channel"), tmp);
+	g_free(tmp);
 }
 
 void irc_msg_nonick(struct irc_conn *irc, const char *name, const char *from, char **args)
@@ -889,14 +892,18 @@ void irc_msg_privmsg(struct irc_conn *ir
 void irc_msg_regonly(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	GaimConnection *gc = gaim_account_get_connection(irc->account);
-	char *msg;
+	char *tmp, *msg;
 
 	if (!args || !args[1] || !args[2] || !gc)
 		return;
 
-	msg = g_strdup_printf(_("Cannot join %s:"), args[1]);
-	gaim_notify_error(gc, _("Cannot join channel"), msg, args[2]);
+	tmp = g_markup_escape_text(args[1], strlen(args[1]));
+	msg = g_strdup_printf(_("Cannot join %s:"), tmp);
+	g_free(tmp);
+	tmp = g_markup_escape_text(args[1], strlen(args[2]));
+	gaim_notify_error(gc, _("Cannot join channel"), msg, tmp);
 	g_free(msg);
+	g_free(tmp);
 }
 
 void irc_msg_quit(struct irc_conn *irc, const char *name, const char *from, char **args)