[Pkg-privacy-commits] [irssi-plugin-otr] 51/267: Little bug in the code to create queries.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit 8b68c8d1a9d1c557d159a4ceb74fcd8c0de2f634
Author: Uli Meis <a.sporto+bee at gmail.com>
Date:   Wed Feb 4 01:59:23 2009 +0100

    Little bug in the code to create queries.
---
 irssi_otr.c | 4 +++-
 otr_util.c  | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/irssi_otr.c b/irssi_otr.c
index 684e400..7687601 100644
--- a/irssi_otr.c
+++ b/irssi_otr.c
@@ -293,7 +293,9 @@ static void otr_statusbar(struct SBAR_ITEM_REC *item, int get_size_only)
 
 void otr_query_create(SERVER_REC *server, const char *nick)
 {
-	if (!settings_get_bool("otr_createqueries")||query_find(server, nick))
+	if (!server||!nick||
+	    !settings_get_bool("otr_createqueries")||
+	    query_find(server, nick))
 		return;
 
 	irc_query_create(server->tag, nick, TRUE);
diff --git a/otr_util.c b/otr_util.c
index b9c3d19..5ed5720 100644
--- a/otr_util.c
+++ b/otr_util.c
@@ -329,9 +329,11 @@ void otr_finish(IRC_CTX *ircctx, char *nick, const char *peername, int inquery)
 	otrl_message_disconnect(otr_state,&otr_ops,ircctx,accname,
 				PROTOCOLID,nick);
 
-	otr_info(inquery ? ircctx : NULL,
-		   inquery ? nick : NULL,
-		   TXT_CMD_FINISH,nick,IRCCTX_ADDR(ircctx));
+	if (inquery) {
+		otr_info(ircctx,nick,TXT_CMD_FINISH,nick,IRCCTX_ADDR(ircctx));
+	} else {
+		otr_infost(TXT_CMD_FINISH,nick,IRCCTX_ADDR(ircctx));
+	}
 
 	coi = co->app_data;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git