diff options
| author | James Booth <boothj5@gmail.com> | 2015-03-08 21:51:50 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-03-08 21:51:50 +0000 |
| commit | 945f29873ec6fb275cdaac72f1e6f143650464b5 (patch) | |
| tree | 08116e2b1e5505aee66b432c8863a85888fb7a51 /tests | |
| parent | 232bf9b7fc80b0f2013359f002d38bc7a4d9c50f (diff) | |
| parent | d89112e13894d4d6a23846997ea7ef0c42674fe4 (diff) | |
| download | profani-tty-945f29873ec6fb275cdaac72f1e6f143650464b5.tar.gz | |
Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/stub_ui.c | 1 | ||||
| -rw-r--r-- | tests/xmpp/stub_xmpp.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/ui/stub_ui.c b/tests/ui/stub_ui.c index 2d67a543..1a0f650d 100644 --- a/tests/ui/stub_ui.c +++ b/tests/ui/stub_ui.c @@ -466,6 +466,7 @@ void cons_outtype_setting(void) {} void cons_intype_setting(void) {} void cons_gone_setting(void) {} void cons_history_setting(void) {} +void cons_carbons_setting(void) {} void cons_log_setting(void) {} void cons_chlog_setting(void) {} void cons_grlog_setting(void) {} diff --git a/tests/xmpp/stub_xmpp.c b/tests/xmpp/stub_xmpp.c index 281857f0..dc9a258e 100644 --- a/tests/xmpp/stub_xmpp.c +++ b/tests/xmpp/stub_xmpp.c @@ -119,6 +119,8 @@ gboolean presence_sub_request_exists(const char * const bare_jid) } // iq functions +void iq_disable_carbons() {}; +void iq_enable_carbons() {}; void iq_send_software_version(const char * const fulljid) {} void iq_room_list_request(gchar *conferencejid) |