devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 17:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added enc_mode to ProfChatWin

Browse Source
This commit is contained in:
James Booth
2015-05-04 21:38:19 +01:00
parent a0c872edf8
commit 8ccbeade44
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/core.c
View File

@@ -714,7 +714,7 @@ ui_close_connected_win(int index)
ProfChatWin *chatwin = (ProfChatWin*) window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
#ifdef HAVE_LIBOTR
if (chatwin->is_otr) {
if (chatwin->enc_mode == PROF_ENC_OTR) {
otr_end_session(chatwin->barejid);
}
#endif
@@ -896,7 +896,7 @@ ui_gone_secure(const char * const barejid, gboolean trusted)
chatwin = (ProfChatWin*)window;
}
chatwin->is_otr = TRUE;
chatwin->enc_mode = PROF_ENC_OTR;
chatwin->is_trusted = trusted;
if (trusted) {
win_print(window, '!', NULL, 0, THEME_OTR_STARTED_TRUSTED, "", "OTR session started (trusted).");
@@ -924,7 +924,7 @@ ui_gone_insecure(const char * const barejid)
{
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) {
chatwin->is_otr = FALSE;
chatwin->enc_mode = PROF_ENC_NONE;
chatwin->is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin;
@@ -1043,7 +1043,7 @@ ui_trust(const char * const barejid)
{
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) {
chatwin->is_otr = TRUE;
chatwin->enc_mode = PROF_ENC_OTR;
chatwin->is_trusted = TRUE;
ProfWin *window = (ProfWin*)chatwin;
@@ -1059,7 +1059,7 @@ ui_untrust(const char * const barejid)
{
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) {
chatwin->is_otr = TRUE;
chatwin->enc_mode = PROF_ENC_OTR;
chatwin->is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin;
@@ -1164,7 +1164,7 @@ ui_current_win_is_otr(void)
if (current->type == WIN_CHAT) {
ProfChatWin *chatwin = (ProfChatWin*)current;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
return chatwin->is_otr;
return chatwin->enc_mode == PROF_ENC_OTR;
} else {
return FALSE;
}
@@ -1304,7 +1304,7 @@ ui_new_chat_win(const char * const barejid)
#ifdef HAVE_LIBOTR
if (otr_is_secure(barejid)) {
chatwin->is_otr = TRUE;
chatwin->enc_mode = PROF_ENC_OTR;
}
#endif