devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-22 11:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
James Booth
2014-12-20 18:39:39 +00:00
parent ea267e2017
commit 6800bf1cad
7 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/commands.c
View File

@@ -3887,7 +3887,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 = wins_get_current_chat();
ProfChatWin *chatwin = ui_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);
@@ -3933,7 +3933,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 = wins_get_current_chat();
ProfChatWin *chatwin = ui_get_current_chat();
char *otr_query_message = otr_start_query();
message_send_chat(chatwin->barejid, otr_query_message);
}

7
src/ui/core.c
View File

@@ -314,6 +314,12 @@ _ui_get_recipients(void)
return recipients;
}
ProfChatWin *
_ui_get_current_chat(void)
{
return wins_get_current_chat();
}
static void
_ui_incoming_msg(const char * const barejid, const char * const message, GTimeVal *tv_stamp)
{
@@ -3208,5 +3214,6 @@ ui_init_module(void)
ui_redraw = _ui_redraw;
ui_show_all_room_rosters = _ui_show_all_room_rosters;
ui_hide_all_room_rosters = _ui_hide_all_room_rosters;
ui_get_current_chat = _ui_get_current_chat;
}

2
src/ui/ui.h
View File

@@ -109,6 +109,8 @@ int (*ui_current_win_index)(void);
gboolean (*ui_current_win_is_otr)(void);
void (*ui_current_set_otr)(gboolean value);
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);