Changeset f93e01c
- Timestamp:
- 2013-08-02T18:31:44Z (11 years ago)
- Branches:
- master
- Children:
- c347a12
- Parents:
- 37ed402
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
otr.c
r37ed402 rf93e01c 967 967 968 968 ctx = otrl_context_find(irc->otr->us, u->bu->handle, 969 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); // XXX969 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); 970 970 if(!ctx) { 971 971 irc_rootmsg(irc, "%s: no otr context with user", args[1]); … … 1031 1031 *(myhandle++) = '\0'; 1032 1032 handle = arg; 1033 ctx = otrl_context_find(irc->otr->us, handle, myhandle, protocol, 0, OTRL_INSTAG_MASTER, NULL, NULL, NULL); // XXX1033 ctx = otrl_context_find(irc->otr->us, handle, myhandle, protocol, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); 1034 1034 if(!ctx) { 1035 1035 irc_rootmsg(irc, "no such context"); … … 1045 1045 } 1046 1046 ctx = otrl_context_find(irc->otr->us, u->bu->handle, u->bu->ic->acc->user, 1047 u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); // XXX1047 u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); 1048 1048 if(!ctx) { 1049 1049 irc_rootmsg(irc, "no otr context with %s", args[1]); … … 1118 1118 1119 1119 g_free(p); 1120 1121 // XXX forget all contexts 1120 1122 1121 1123 if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) { … … 1164 1166 1165 1167 ctx = otrl_context_find(irc->otr->us, u->bu->handle, u->bu->ic->acc->user, 1166 u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); // XXX1168 u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); 1167 1169 if(!ctx) { 1168 1170 irc_rootmsg(irc, "no otr context with %s", args[2]); … … 1207 1209 1208 1210 ctx = otrl_context_find(irc->otr->us, u->bu->handle, u->bu->ic->acc->user, 1209 u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); // XXX1211 u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); 1210 1212 if(!ctx) { 1211 1213 irc_rootmsg(irc, "no otr context with %s", args[2]); … … 1294 1296 irc_user_t *u; 1295 1297 ConnContext *ctx; 1298 otrl_instag_t instag = OTRL_INSTAG_RECENT; // XXX 1296 1299 1297 1300 u = irc_user_by_name(irc, nick); … … 1306 1309 1307 1310 ctx = otrl_context_find(irc->otr->us, u->bu->handle, 1308 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, OTRL_INSTAG_MASTER, 0, NULL, NULL, NULL); // XXX1311 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, instag, 0, NULL, NULL, NULL); 1309 1312 if(!ctx || ctx->msgstate != OTRL_MSGSTATE_ENCRYPTED) { 1310 1313 irc_rootmsg(irc, "smp: otr inactive with %s, try \x02otr connect" … … 1687 1690 void show_otr_context_info(irc_t *irc, ConnContext *ctx) 1688 1691 { 1692 // XXX show all contexts 1693 1689 1694 switch(ctx->otr_offer) { 1690 1695 case OFFER_NOT:
Note: See TracChangeset
for help on using the changeset viewer.