Merge branch 'master' into openpgp

2 files changed, 0 insertions, 14 deletions

diff --git a/src/ui/core.c b/src/ui/core.c
index 6cfa8594..f517d51d 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -1151,19 +1151,6 @@ ui_current_win_type(void)
     return current->type;
 }
 
-gboolean
-ui_current_win_is_otr(void)
-{
-    ProfWin *current = wins_get_current();
-    if (current->type == WIN_CHAT) {
-        ProfChatWin *chatwin = (ProfChatWin*)current;
-        assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
-        return chatwin->enc_mode == PROF_ENC_OTR;
-    } else {
-        return FALSE;
-    }
-}
-
 win_type_t
 ui_win_type(int index)
 {
diff --git a/src/ui/ui.h b/src/ui/ui.h
index cd5349d2..abe50435 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -194,7 +194,6 @@ int ui_close_read_wins(void);
 
 // current window actions
 win_type_t ui_current_win_type(void);
-gboolean ui_current_win_is_otr(void);
 
 void ui_current_print_line(const char * const msg, ...);
 void ui_current_print_formatted_line(const char show_char, int attrs, const char * const msg, ...);