Merge branch 'master' into openpgp

This commit is contained in:
James Booth
2015-05-07 23:16:22 +01:00
7 changed files with 17 additions and 22 deletions

View File

@@ -941,9 +941,9 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
will_return(jabber_get_presence_message, "Free to chat");
expect_value(presence_update, status, RESOURCE_ONLINE);
expect_string(presence_update, msg, "Free to chat");
expect_value(presence_update, idle, 0);
expect_value(presence_send, status, RESOURCE_ONLINE);
expect_string(presence_send, msg, "Free to chat");
expect_value(presence_send, idle, 0);
expect_cons_show("Updated online priority for account a_account: 10");
expect_cons_show("");

View File

@@ -114,7 +114,7 @@ void presence_join_room(char *room, char *nick, char * passwd)
void presence_change_room_nick(const char * const room, const char * const nick) {}
void presence_leave_chat_room(const char * const room_jid) {}
void presence_update(resource_presence_t status, const char * const msg, int idle)
void presence_send(resource_presence_t status, const char * const msg, int idle)
{
check_expected(status);
check_expected(msg);