Changeset 09f7ec1


Ignore:
Timestamp:
2015-10-21T11:40:11Z (9 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
3314ced
Parents:
2b0c05c
Message:

Add a per-user version of OPT_NOOTR, BEE_USER_NOOTR

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • otr.c

    r2b0c05c r09f7ec1  
    441441
    442442        /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
    443         if (ic->acc->prpl->options & OPT_NOOTR) {
     443        if (ic->acc->prpl->options & OPT_NOOTR ||
     444            iu->bu->flags & BEE_USER_NOOTR) {
    444445                return msg;
    445446        }
    … …  
    479480
    480481        /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
    481         if (ic->acc->prpl->options & OPT_NOOTR) {
     482        if (ic->acc->prpl->options & OPT_NOOTR ||
     483            iu->bu->flags & BEE_USER_NOOTR) {
    482484                return msg;
    483485        }

  • protocols/bee.h

    r2b0c05c r09f7ec1  
    6262        BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
    6363        BEE_USER_SPECIAL = 512, /* Denotes a user as being special */
     64        BEE_USER_NOOTR = 4096,  /* Per-user version of OPT_NOOTR */
    6465} bee_user_flags_t;
    6566
Note: See TracChangeset for help on using the changeset viewer.