summary refs log tree commit diff stats
path: root/src/common/proto-irc.c
diff options
context:
space:
mode:
authorDiogo Sousa <diogogsousa@gmail.com>2013-07-09 23:11:28 +0100
committerDiogo Sousa <diogogsousa@gmail.com>2013-07-09 23:11:28 +0100
commit7101b7b864df280059750c0de4d6b9d41e907122 (patch)
treee294b2b2d5e7e08c744bd8ec891fc28543d17790 /src/common/proto-irc.c
parent98aa62f637d4ced952a168cb19f8d2fb038c6a16 (diff)
Now hexchat_hook_server_attrs() and hexchat_hook_print_attrs() is called
when it should. This should close #661.
Diffstat (limited to 'src/common/proto-irc.c')
-rw-r--r--src/common/proto-irc.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index bea9f6f7..07c2b696 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -1506,15 +1506,24 @@ irc_inline (server *serv, char *buf, int len)
 
 		word[0] = type;
 		word_eol[1] = buf;	/* keep the ":" for plugins */
-		if (plugin_emit_server (sess, type, word, word_eol))
+
+		/* don't use || here, since it might short-circuit */
+		if (plugin_emit_server (sess, type, word, word_eol)
+			+ plugin_emit_server_attrs (sess, type, word, word_eol, 
+										tags_data.timestamp))
 			goto xit;
+
 		word[1]++;
 		word_eol[1] = buf + 1;	/* but not for HexChat internally */
 
 	} else
 	{
 		word[0] = type = word[1];
-		if (plugin_emit_server (sess, type, word, word_eol))
+
+		/* don't use || here, since it might short-circuit */
+		if (plugin_emit_server (sess, type, word, word_eol)
+			+ plugin_emit_server_attrs (sess, type, word, word_eol,
+										tags_data.timestamp))
 			goto xit;
 	}