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

Moved UI error handler code to ui/core

Browse Source
This commit is contained in:
James Booth
2013-10-06 00:05:23 +01:00
parent 738be65edc
commit 710c49b6b8
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/profanity.c
View File

@@ -187,27 +187,7 @@ prof_handle_group_remove(const char * const contact,
void
prof_handle_error_message(const char *from, const char *err_msg)
{
win_type_t win_type = ui_current_win_type();
if (err_msg == NULL) {
cons_show_error("Unknown error received from service.");
} else if (strcmp(err_msg, "conflict") == 0) {
if (win_type == WIN_MUC) {
ui_current_print_line("Nickname already in use.");
} else {
cons_show_error("Error received from server: %s", err_msg);
}
// 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);
}
jid_destroy(room_jid);
} else {
cons_show_error("Error received from server: %s", err_msg);
}
ui_print_error_from_recipient(from, err_msg);
ui_handle_error_message(from, err_msg);
}
void