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

This commit is contained in:
James Booth
2015-03-08 21:51:50 +00:00
17 changed files with 167 additions and 2 deletions

View File

@@ -296,6 +296,11 @@ handle_incoming_private_message(char *fulljid, char *message)
ui_incoming_private_msg(fulljid, message, NULL);
}
void
handle_carbon(char *barejid, char *message){
ui_outgoing_chat_msg("me", barejid, message);
}
void
handle_incoming_message(char *barejid, char *resource, char *message)
{