From f8f1f814a511376bfae25ef4daeadf9c6ac57d64 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Tue, 9 Jan 2001 18:56:56 +0000
Subject: [PATCH] query_find() didn't check for queries with no active server

Some DCC CHAT format fixes


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1097 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 default.theme                          |  3 ++-
 src/core/queries.c                     | 16 +++++++++++-----
 src/fe-common/irc/dcc/module-formats.c |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/default.theme b/default.theme
index ddd54d8d..10d06485 100644
--- a/default.theme
+++ b/default.theme
@@ -216,7 +216,8 @@ abstracts = {
   dccfile = "%_$0-%_";
 
   # DCC chat, own msg/action
-  dccownmsg = "[%r$0%K(%R$1-%K)%n] ";
+  dccownmsg = "[%r$0%K($1-%K)%n] ";
+  dccownnick = "%R$0-%n";
   dccownaction = "{action $0-}";
 
   # DCC chat, others
diff --git a/src/core/queries.c b/src/core/queries.c
index 6e5dd0a9..38a597ad 100644
--- a/src/core/queries.c
+++ b/src/core/queries.c
@@ -96,7 +96,7 @@ static QUERY_REC *query_find_server(SERVER_REC *server, const char *nick)
 	for (tmp = server->queries; tmp != NULL; tmp = tmp->next) {
 		QUERY_REC *rec = tmp->data;
 
-		if (g_strcasecmp(nick, rec->name) == 0)
+		if (g_strcasecmp(rec->name, nick) == 0)
 			return rec;
 	}
 
@@ -105,16 +105,22 @@ static QUERY_REC *query_find_server(SERVER_REC *server, const char *nick)
 
 QUERY_REC *query_find(SERVER_REC *server, const char *nick)
 {
+	GSList *tmp;
+
 	g_return_val_if_fail(server == NULL || IS_SERVER(server), NULL);
 	g_return_val_if_fail(nick != NULL, NULL);
 
 	if (server != NULL)
 		return query_find_server(server, nick);
 
-	/* find from any server */
-	return gslist_foreach_find(servers,
-				   (FOREACH_FIND_FUNC) query_find_server,
-				   (void *) nick);
+	for (tmp = queries; tmp != NULL; tmp = tmp->next) {
+		QUERY_REC *rec = tmp->data;
+
+		if (g_strcasecmp(rec->name, nick) == 0)
+			return rec;
+	}
+
+        return NULL;
 }
 
 void query_change_nick(QUERY_REC *query, const char *nick)
diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c
index 57e6a26f..e1e32930 100644
--- a/src/fe-common/irc/dcc/module-formats.c
+++ b/src/fe-common/irc/dcc/module-formats.c
@@ -32,7 +32,7 @@ FORMAT_REC fecommon_irc_dcc_formats[] = {
 	{ "own_dcc_ctcp", "{ownctcp ctcp $0}$1 $2", 3, { 0, 0, 0 } },
 	{ "dcc_msg", "{dccmsg dcc $0}$1", 2, { 0, 0 } },
 	{ "action_dcc", "{dccaction $0}$1", 2, { 0, 0 } },
-	{ "own_dcc_query", "{ownmsgnick {msgownnick $0}}$2", 3, { 0, 0, 0 } },
+	{ "own_dcc_query", "{ownmsgnick {ownnick $0}}$2", 3, { 0, 0, 0 } },
 	{ "dcc_msg_query", "{privmsgnick $0}$1", 2, { 0, 0 } },
 	{ "dcc_ctcp", "{dcc >>> DCC CTCP received from {hilight $0}: $1}", 2, { 0, 0 } },
 	{ "dcc_chat", "{dcc DCC CHAT from {nick $0} [$1 port $2]}", 3, { 0, 0, 1 } },