diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-15 22:03:25 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-15 22:03:25 +0100 |
| commit | de4745059465f0baa21b4c3e721971cf40cd0d87 (patch) | |
| tree | 02303feb3f05288dbbe8449614ac15299d899938 /src | |
| parent | c76692516a65af35249e93071a6478fd9d799fff (diff) | |
| parent | 6097a5bade7fdcd333b8127c36d31024ae29284b (diff) | |
| download | profani-tty-de4745059465f0baa21b4c3e721971cf40cd0d87.tar.gz | |
Merge branch 'master' into openpgp
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/commands.c | 4 | ||||
| -rw-r--r-- | src/ui/core.c | 6 | ||||
| -rw-r--r-- | src/ui/ui.h | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index 96cca6e1..4a35bc43 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -4286,7 +4286,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) } else if (!ui_current_win_is_otr()) { ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session."); } else { - ProfChatWin *chatwin = ui_get_current_chat(); + ProfChatWin *chatwin = wins_get_current_chat(); char *fingerprint = otr_get_their_fingerprint(chatwin->barejid); ui_current_print_formatted_line('!', 0, "%s's OTR fingerprint: %s", chatwin->barejid, fingerprint); free(fingerprint); @@ -4330,7 +4330,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) if (!otr_key_loaded()) { ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'"); } else { - ProfChatWin *chatwin = ui_get_current_chat(); + ProfChatWin *chatwin = wins_get_current_chat(); char *otr_query_message = otr_start_query(); message_send_chat_encrypted(chatwin->barejid, otr_query_message); } diff --git a/src/ui/core.c b/src/ui/core.c index 127405f6..6cfa8594 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -405,12 +405,6 @@ ui_get_chat_recipients(void) return recipients; } -ProfChatWin * -ui_get_current_chat(void) -{ - return wins_get_current_chat(); -} - void ui_message_receipt(const char * const barejid, const char * const id) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 434fab24..cd5349d2 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -196,8 +196,6 @@ int ui_close_read_wins(void); win_type_t ui_current_win_type(void); gboolean ui_current_win_is_otr(void); -ProfChatWin *ui_get_current_chat(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, ...); void ui_current_error_line(const char * const msg); |