From 9f03c472fef309878ff2f3bc720d51e6d03077f1 Mon Sep 17 00:00:00 2001 From: dequis Date: Sun, 13 Nov 2016 21:37:14 -0300 Subject: Improve support for protocols which don't require a password This adds a prpl_options_t enum with flags, which mostly just brings OPT_PROTO_{NO_PASSWORD,PASSWORD_OPTIONAL} from libpurple as PRPL_OPT_{NO_PASSWORD,PASSWORD_OPTIONAL} --- otr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'otr.c') diff --git a/otr.c b/otr.c index d07617f7..d2c1a2f2 100644 --- a/otr.c +++ b/otr.c @@ -428,7 +428,7 @@ int otr_check_for_key(account_t *a) OtrlPrivKey *k; /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */ - if (a->prpl->options & OPT_NOOTR) { + if (a->prpl->options & PRPL_OPT_NOOTR) { return 0; } @@ -456,7 +456,7 @@ char *otr_filter_msg_in(irc_user_t *iu, char *msg, int flags) struct im_connection *ic = iu->bu->ic; /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */ - if (ic->acc->prpl->options & OPT_NOOTR || + if (ic->acc->prpl->options & PRPL_OPT_NOOTR || iu->bu->flags & BEE_USER_NOOTR) { return msg; } -- cgit v1.2.3