[Pkg-privacy-commits] [irssi-plugin-otr] 153/267: Fix: minor fixes in Makefile and msg output

[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 570ac3edfb2aee48fe4fab02be9d8eef59215ad7
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Mon Nov 26 22:12:39 2012 -0500

    Fix: minor fixes in Makefile and msg output
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/Makefile.am | 3 ++-
 src/module.h    | 2 --
 src/otr-ops.c   | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e44c31..188c4d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,4 +18,5 @@ lib_LTLIBRARIES = libotr.la
 libotr_la_SOURCES = key.c key.h cmd.c cmd.h otr.c otr-ops.c \
 					utils.h utils.c otr.h module.c irssi_otr.h \
 					otr-formats.c otr-formats.h
-libotr_la_LDFLAGS = -module -avoid-version $(LIBOTR_LIBS)
+libotr_la_LDFLAGS = -module -avoid-version -shared
+libotr_la_LIBADD = $(LIBOTR_LIBS) $(LIBGCRYPT_LIBS)
diff --git a/src/module.h b/src/module.h
index 4110610..4ae8d4c 100644
--- a/src/module.h
+++ b/src/module.h
@@ -19,8 +19,6 @@
 #ifndef IRSSI_OTR_MODULE
 #define IRSSI_OTR_MODULE
 
-#include "otr.h"
-
 void sig_message_private(SERVER_REC *server, const char *msg,
 		const char *nick, const char *address);
 
diff --git a/src/otr-ops.c b/src/otr-ops.c
index 4c10d2e..4b63a99 100644
--- a/src/otr-ops.c
+++ b/src/otr-ops.c
@@ -335,9 +335,9 @@ static void ops_smp_event(void *opdata, OtrlSMPEvent smp_event,
 		break;
 	case OTRL_SMPEVENT_ASK_FOR_ANSWER:
 		IRSSI_NOTICE(irssi, from, "%9%s%9 wants to authenticate and "
-				"asked this question: %9%s%9\n"
-				"Type %9/otr auth <SECRET>%9 to complete.", from,
-				question);
+				"asked this question:", from);
+		IRSSI_NOTICE(irssi, from, "-> %9%s%9", question);
+		IRSSI_NOTICE(irssi, from, "Type %9/otr auth <SECRET>%9 to complete.");
 		opc->ask_secret = 1;
 		otr_status_change(irssi, from, OTR_STATUS_SMP_INCOMING);
 		break;

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