From 4770c1c4eebf1d792301671540746ce4212d9179 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Wed, 13 Mar 2002 02:59:01 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2597 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 src/irc/Makefile.am | 3 +++
 src/irc/core/irc.c  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index cdea8d60..3d803c35 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -11,3 +11,6 @@ SUBDIRS = core $(BOT) dcc flood notifylist $(PROXY)
 noinst_LIBRARIES = libirc.a
 
 libirc_a_SOURCES = irc.c
+
+distclean-generic:
+	rm -f irc.c
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index d7afaa23..0743dae2 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -322,12 +322,14 @@ static char *irc_parse_prefix(char *line, char **nick, char **address)
 {
 	*nick = *address = NULL;
 
+	/* :<nick> [["!" <user>] "@" <host>] SPACE */
+
 	if (*line != ':')
 		return line;
 
 	*nick = ++line;
 	while (*line != '\0' && *line != ' ') {
-		if (*line == '!') {
+		if (*line == '!' || *line == '@') {
 			*line++ = '\0';
 			*address = line;
 			while (*line != '\0' && *line != ' ')