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

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-04-27 23:45:51 +01:00
parent 7a44e17141 70d1756a1c
commit 43189b1ab4
5 changed files with 92 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/otr/stub_otr.c
View File

@@ -41,6 +41,8 @@ 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) {}
void otr_keygen(ProfAccount *account)
{
@@ -53,7 +55,7 @@ gboolean otr_key_loaded(void)
}
char* otr_tag_message(const char * const msg)
{
{
return NULL;
}