aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth 2015-06-13 16:27:20 +01:00
commit 0ef00e87ab
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/core.c
View File

@ -909,7 +909,7 @@ ui_gone_secure(const char * const barejid, gboolean trusted)
} }
chatwin->enc_mode = PROF_ENC_OTR; chatwin->enc_mode = PROF_ENC_OTR;
chatwin->is_trusted = trusted; chatwin->otr_is_trusted = trusted;
if (trusted) { if (trusted) {
win_print(window, '!', NULL, 0, THEME_OTR_STARTED_TRUSTED, "", "OTR session started (trusted)."); win_print(window, '!', NULL, 0, THEME_OTR_STARTED_TRUSTED, "", "OTR session started (trusted).");
} else { } else {
@ -937,7 +937,7 @@ ui_gone_insecure(const char * const barejid)
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) { if (chatwin) {
chatwin->enc_mode = PROF_ENC_NONE; chatwin->enc_mode = PROF_ENC_NONE;
chatwin->is_trusted = FALSE; chatwin->otr_is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_print(window, '!', NULL, 0, THEME_OTR_ENDED, "", "OTR session ended."); win_print(window, '!', NULL, 0, THEME_OTR_ENDED, "", "OTR session ended.");
@ -1056,7 +1056,7 @@ ui_trust(const char * const barejid)
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) { if (chatwin) {
chatwin->enc_mode = PROF_ENC_OTR; chatwin->enc_mode = PROF_ENC_OTR;
chatwin->is_trusted = TRUE; chatwin->otr_is_trusted = TRUE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_print(window, '!', NULL, 0, THEME_OTR_TRUSTED, "", "OTR session trusted."); win_print(window, '!', NULL, 0, THEME_OTR_TRUSTED, "", "OTR session trusted.");
@ -1072,7 +1072,7 @@ ui_untrust(const char * const barejid)
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) { if (chatwin) {
chatwin->enc_mode = PROF_ENC_OTR; chatwin->enc_mode = PROF_ENC_OTR;
chatwin->is_trusted = FALSE; chatwin->otr_is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_print(window, '!', NULL, 0, THEME_OTR_UNTRUSTED, "", "OTR session untrusted."); win_print(window, '!', NULL, 0, THEME_OTR_UNTRUSTED, "", "OTR session untrusted.");

2
src/ui/titlebar.c
View File

@ -278,7 +278,7 @@ _show_privacy(ProfChatWin *chatwin)
wattron(win, bracket_attrs); wattron(win, bracket_attrs);
wprintw(win, "]"); wprintw(win, "]");
wattroff(win, bracket_attrs); wattroff(win, bracket_attrs);
if (chatwin->is_trusted) { if (chatwin->otr_is_trusted) {
int trusted_attrs = theme_attrs(THEME_TITLE_TRUSTED); int trusted_attrs = theme_attrs(THEME_TITLE_TRUSTED);
wprintw(win, " "); wprintw(win, " ");
wattron(win, bracket_attrs); wattron(win, bracket_attrs);

2
src/ui/window.c
View File

@ -135,7 +135,7 @@ win_create_chat(const char * const barejid)
new_win->barejid = strdup(barejid); new_win->barejid = strdup(barejid);
new_win->resource_override = NULL; new_win->resource_override = NULL;
new_win->enc_mode = PROF_ENC_NONE; new_win->enc_mode = PROF_ENC_NONE;
new_win->is_trusted = FALSE; new_win->otr_is_trusted = FALSE;
new_win->history_shown = FALSE; new_win->history_shown = FALSE;
new_win->unread = 0; new_win->unread = 0;
new_win->state = chat_state_new(); new_win->state = chat_state_new();

2
src/ui/window.h
View File

@ -119,7 +119,7 @@ typedef struct prof_chat_win_t {
int unread; int unread;
ChatState *state; ChatState *state;
prof_enc_t enc_mode; prof_enc_t enc_mode;
gboolean is_trusted; gboolean otr_is_trusted;
char *resource_override; char *resource_override;
gboolean history_shown; gboolean history_shown;
unsigned long memcheck; unsigned long memcheck;