devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Removed ui_get_current_chat()

Browse Source
This commit is contained in:
James Booth
2015-06-15 22:01:28 +01:00
parent 5cdd69f478
commit 6097a5bade
5 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/commands.c
View File

@@ -4215,7 +4215,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);
@@ -4259,7 +4259,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);
}

6
src/ui/core.c
View File

@@ -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)
{

2
src/ui/ui.h
View File

@@ -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);