Combined chatwin OTR SMP functions

This commit is contained in:
James Booth
2015-10-27 22:25:02 +00:00
parent 40dcd59727
commit ff9abecd50
8 changed files with 93 additions and 126 deletions

View File

@@ -38,6 +38,7 @@
#include "command/commands.h"
#include "ui/win_types.h"
#include "muc.h"
#include "otr/otr.h"
#define NO_ME 1
#define NO_DATE 2
@@ -66,19 +67,7 @@ void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
void chatwin_otr_unsecured(ProfChatWin *chatwin);
void chatwin_otr_trust(ProfChatWin *chatwin);
void chatwin_otr_untrust(ProfChatWin *chatwin);
void chatwin_otr_smp_init(ProfChatWin *chatwin);
void chatwin_otr_smp_init_q(ProfChatWin *chatwin, const char *question);
void chatwin_otr_smp_success(ProfChatWin *chatwin);
void chatwin_otr_smp_sender_failed(ProfChatWin *chatwin);
void chatwin_otr_smp_receiver_failed(ProfChatWin *chatwin);
void chatwin_otr_smp_aborted(ProfChatWin *chatwin);
void chatwin_otr_smp_answer_success(ProfChatWin *chatwin);
void chatwin_otr_smp_answer_failure(ProfChatWin *chatwin);
void chatwin_otr_smp_authenticating(ProfChatWin *chatwin);
void chatwin_otr_smp_authenticaton_wait(ProfChatWin *chatwin);
void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data);
void ui_handle_otr_error(const char *const barejid, const char *const message);
@@ -372,6 +361,7 @@ void win_show_occupant_info(ProfWin *window, const char *const room, Occupant *o
void win_show_contact(ProfWin *window, PContact contact);
void win_show_info(ProfWin *window, PContact contact);
void win_println(ProfWin *window, int pad, const char *const message);
void win_vprintln_ch(ProfWin *window, char ch, const char *const message, ...);
// desktop notifier actions
void notifier_initialise(void);