Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280

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) {}

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)