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

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-04-29 23:08:23 +01:00
parent 5d827cafec 665c34414d
commit 0fece78dfe
11 changed files with 135 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/otr/stub_otr.c
View File

@@ -42,7 +42,10 @@ char* otr_start_query(void)
void otr_poll(void) {}
void otr_on_connect(ProfAccount *account) {}
void otr_on_message_recv(const char * const barejid, const char * const resource, const char * const message) {}
void otr_on_message_send(const char * const barejid, const char * const message) {}
prof_otrsendres_t otr_on_message_send(const char * const barejid, const char * const message)
{
return PROF_OTRSUCCESS;
}
void otr_keygen(ProfAccount *account)
{
@@ -106,3 +109,9 @@ prof_otrpolicy_t otr_get_policy(const char * const recipient)
{
return PROF_OTRPOLICY_MANUAL;
}
char* otr_senderror_str(prof_otrsendres_t res)
{
return NULL;
}

2
tests/ui/stub_ui.c
View File

@@ -105,7 +105,7 @@ unsigned long ui_get_idle_time(void)
void ui_reset_idle_time(void) {}
void ui_new_private_win(const char * const fulljid) {}
ProfWin* ui_new_chat_win(const char * const barejid)
ProfChatWin* ui_new_chat_win(const char * const barejid)
{
return NULL;
}