Merge branch 'master' into openpgp

4 files changed, 7 insertions, 7 deletions

diff --git a/src/ui/core.c b/src/ui/core.c
index 8431371d..3b29c094 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -909,7 +909,7 @@ ui_gone_secure(const char * const barejid, gboolean trusted)
     }
 
     chatwin->enc_mode = PROF_ENC_OTR;
-    chatwin->is_trusted = trusted;
+    chatwin->otr_is_trusted = trusted;
     if (trusted) {
         win_print(window, '!', NULL, 0, THEME_OTR_STARTED_TRUSTED, "", "OTR session started (trusted).");
     } else {
@@ -937,7 +937,7 @@ ui_gone_insecure(const char * const barejid)
     ProfChatWin *chatwin = wins_get_chat(barejid);
     if (chatwin) {
         chatwin->enc_mode = PROF_ENC_NONE;
-        chatwin->is_trusted = FALSE;
+        chatwin->otr_is_trusted = FALSE;
 
         ProfWin *window = (ProfWin*)chatwin;
         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);
     if (chatwin) {
         chatwin->enc_mode = PROF_ENC_OTR;
-        chatwin->is_trusted = TRUE;
+        chatwin->otr_is_trusted = TRUE;
 
         ProfWin *window = (ProfWin*)chatwin;
         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);
     if (chatwin) {
         chatwin->enc_mode = PROF_ENC_OTR;
-        chatwin->is_trusted = FALSE;
+        chatwin->otr_is_trusted = FALSE;
 
         ProfWin *window = (ProfWin*)chatwin;
         win_print(window, '!', NULL, 0, THEME_OTR_UNTRUSTED, "", "OTR session untrusted.");
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 9bb84f9d..55710c7a 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -278,7 +278,7 @@ _show_privacy(ProfChatWin *chatwin)
         wattron(win, bracket_attrs);
         wprintw(win, "]");
         wattroff(win, bracket_attrs);
-        if (chatwin->is_trusted) {
+        if (chatwin->otr_is_trusted) {
             int trusted_attrs = theme_attrs(THEME_TITLE_TRUSTED);
             wprintw(win, " ");
             wattron(win, bracket_attrs);
diff --git a/src/ui/window.c b/src/ui/window.c
index 9752ffda..95b5e996 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -135,7 +135,7 @@ win_create_chat(const char * const barejid)
     new_win->barejid = strdup(barejid);
     new_win->resource_override = NULL;
     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->unread = 0;
     new_win->state = chat_state_new();
diff --git a/src/ui/window.h b/src/ui/window.h
index d5e57971..06fbf7b5 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -119,7 +119,7 @@ typedef struct prof_chat_win_t {
     int unread;
     ChatState *state;
     prof_enc_t enc_mode;
-    gboolean is_trusted;
+    gboolean otr_is_trusted;
     char *resource_override;
     gboolean history_shown;
     unsigned long memcheck;