Merge branch 'master' into xep-0184

Conflicts:
	src/server_events.c
	src/ui/core.c
	src/ui/ui.h
	tests/ui/stub_ui.c

src/server_events.c

@@ -309,8 +309,9 @@ handle_incoming_private_message(char *fulljid, char *message)
 }
 
 void
-handle_carbon(char *barejid, char *message){
-    ui_outgoing_chat_msg(barejid, message, NULL);
+handle_carbon(char *barejid, char *message)
+{
+    ui_outgoing_chat_msg_carbon(barejid, message);
 }
 
 void
@@ -842,4 +843,4 @@ handle_muc_occupant_online(const char * const room, const char * const nick, con
         }
         occupantswin_occupants(room);
     }
-}
+}