devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Refactored handle_presence_error, removed no longer used functions

Browse Source
This commit is contained in:
James Booth
2014-01-30 22:20:57 +00:00
parent 2cd24a484a
commit 12666b41e6
7 changed files with 16 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server_events.c
View File

@@ -39,17 +39,26 @@
// handle presence stanza errors
void
handle_presence_error(const char *from, const char *err_msg)
handle_presence_error(const char *from, const char * const type,
const char *err_msg)
{
ui_handle_error_message(from, err_msg);
// handle nickname conflict on entering room
if (g_strcmp0(err_msg, "conflict") == 0) {
// remove the room from muc
Jid *room_jid = jid_create(from);
if (!muc_get_roster_received(room_jid->barejid)) {
muc_leave_room(room_jid->barejid);
ui_handle_recipient_error(room_jid->barejid, err_msg);
}
jid_destroy(room_jid);
// handle any other error from recipient
} else if (from != NULL) {
ui_handle_recipient_error(from, err_msg);
// handle errors from no recipient
} else {
ui_handle_error(err_msg);
}
}