[Pkg-privacy-commits] [irssi-plugin-otr] 134/267: Fix: irssi notice typo and changes

[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 cfee5173d7bcb1e7cc086a65b120bb82e36676c6
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Wed Nov 14 16:26:20 2012 -0500

    Fix: irssi notice typo and changes
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/cmd.c     | 4 ++--
 src/otr-ops.c | 2 +-
 src/otr.c     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cmd.c b/src/cmd.c
index cd2f1d7..39d94d6 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -91,10 +91,10 @@ static void _cmd_trust(struct otr_user_state *ustate, SERVER_REC *irssi,
 		fp = str_fp;
 	} else if (!irssi || (irssi && argc != 0)) {
 		/* If no IRSSI or some arguments (not 5), bad command. */
-		IRSSI_NOTICE(irssi, target, "Usage %9/otr forget [FP]%9 "
+		IRSSI_NOTICE(irssi, target, "Usage %9/otr trust [FP]%9 "
 				"where FP is the five part of the fingerprint listed by "
 				"%9/otr contexts%9 or do the command inside an OTR session "
-				"private message window");
+				"private message window.");
 		goto end;
 	}
 
diff --git a/src/otr-ops.c b/src/otr-ops.c
index 49db0ed..4c10d2e 100644
--- a/src/otr-ops.c
+++ b/src/otr-ops.c
@@ -146,7 +146,7 @@ static void ops_secure(void *opdata, ConnContext *context)
 	IRSSI_NOTICE(irssi, context->username, "Your fingerprint is: %y%s%n",
 			ownfp);
 	IRSSI_NOTICE(irssi, context->username, "%9%s's%9 fingerprint is: %r%s%n",
-			peerfp);
+			context->username, peerfp);
 
 end:
 	return;
diff --git a/src/otr.c b/src/otr.c
index 942872a..ad8d75d 100644
--- a/src/otr.c
+++ b/src/otr.c
@@ -825,7 +825,7 @@ void otr_forget(SERVER_REC *irssi, const char *nick, char *str_fp,
 		if (fp_forget->context->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
 			IRSSI_NOTICE(irssi, nick, "Fingerprint "
 					"context is still encrypted. Finish the OTR "
-					"session beforehands.");
+					"session to forget fingerprint (%9/otr finish%9).");
 			goto end;
 		}
 

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