1 files changed, 7 insertions, 21 deletions

diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index ac1a72a1..64995ead 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -45,6 +45,8 @@ QUERY_REC *irc_query_find(IRC_SERVER_REC *server, const char *nick)
 {
 	GSList *tmp;
 
+	g_return_val_if_fail(nick != NULL, NULL);
+
 	for (tmp = server->queries; tmp != NULL; tmp = tmp->next) {
 		QUERY_REC *rec = tmp->data;
 
@@ -60,39 +62,25 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
 {
 	QUERY_REC *query;
 
-	if (ischannel(*target))
-                return;
+	if (server_ischannel(SERVER(server), target))
+		return;
 
 	query = irc_query_find(server, nick);
 	if (query == NULL)
 		return;
 
-	if (strcmp(query->name, nick) != 0) {
+	if (g_strcmp0(query->name, nick) != 0) {
 		/* upper/lowercase chars in nick changed */
 		query_change_nick(query, nick);
 	}
 
 	if (address != NULL && (query->address == NULL ||
-				strcmp(query->address, address) != 0)) {
+				g_strcmp0(query->address, address) != 0)) {
                 /* host changed */
 		query_change_address(query, address);
 	}
 }
 
-static void event_privmsg(IRC_SERVER_REC *server, const char *data,
-			  const char *nick, const char *address)
-{
-	char *params, *target, *msg;
-
-	g_return_if_fail(data != NULL);
-	if (nick == NULL)
-		return;
-
-	params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
-        check_query_changes(server, nick, address, target);
-	g_free(params);
-}
-
 static void ctcp_action(IRC_SERVER_REC *server, const char *msg,
 			const char *nick, const char *address,
 			const char *target)
@@ -109,7 +97,7 @@ static void event_nick(SERVER_REC *server, const char *data,
 	query = query_find(server, orignick);
 	if (query != NULL) {
 		params = event_get_params(data, 1, &nick);
-		if (strcmp(query->name, nick) != 0)
+		if (g_strcmp0(query->name, nick) != 0)
 			query_change_nick(query, nick);
 		g_free(params);
 	}
@@ -117,14 +105,12 @@ static void event_nick(SERVER_REC *server, const char *data,
 
 void irc_queries_init(void)
 {
-	signal_add_last("event privmsg", (SIGNAL_FUNC) event_privmsg);
 	signal_add_last("ctcp action", (SIGNAL_FUNC) ctcp_action);
 	signal_add("event nick", (SIGNAL_FUNC) event_nick);
 }
 
 void irc_queries_deinit(void)
 {
-	signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
 	signal_remove("ctcp action", (SIGNAL_FUNC) ctcp_action);
 	signal_remove("event nick", (SIGNAL_FUNC) event_nick);
 }