devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-31 15:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor error handling to use win_type switch

Browse Source
This commit is contained in:
James Booth
2013-10-06 00:42:30 +01:00
parent 3dffc1d9ff
commit 18b7def422
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ui/core.c
View File

@@ -405,17 +405,27 @@ ui_group_removed(const char * const contact, const char * const group)
void void
ui_handle_error_message(const char * const from, const char * const err_msg) ui_handle_error_message(const char * const from, const char * const err_msg)
{ {
win_type_t win_type = ui_current_win_type();
if (err_msg == NULL) { if (err_msg == NULL) {
cons_show_error("Unknown error received from service."); cons_show_error("Unknown error received from service.");
} else if (strcmp(err_msg, "conflict") == 0) { } else {
if (win_type == WIN_MUC) { win_type_t win_type = ui_current_win_type();
ui_current_print_line("Nickname already in use."); gboolean handled = FALSE;
} else {
switch (win_type)
{
case WIN_MUC:
if (g_strcmp0(err_msg, "conflict") == 0) {
ui_current_print_line("Nickname already in use.");
handled = TRUE;
}
break;
default:
break;
}
if (handled != TRUE) {
cons_show_error("Error received from server: %s", err_msg); cons_show_error("Error received from server: %s", err_msg);
} }
} else {
cons_show_error("Error received from server: %s", err_msg);
} }
ui_print_error_from_recipient(from, err_msg); ui_print_error_from_recipient(from, err_msg);