aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Added fallback message error handlers

Browse Source
This commit is contained in:
James Booth 2014-01-27 22:09:16 +00:00
parent 678a5bd05c
commit 27293ebbc2
5 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server_events.c
View File

@ -61,6 +61,18 @@ handle_recipient_not_found(const char * const recipient, const char * const err_
}
}
void
handle_recipient_error(const char * const recipient, const char * const err_msg)
{
ui_handle_recipient_error(recipient, err_msg);
}
void
handle_error(const char * const err_msg)
{
ui_handle_error(err_msg);
}
void
handle_login_account_success(char *account_name)
{

2
src/server_events.h
View File

@ -76,5 +76,7 @@ void handle_roster_remove(const char * const barejid);
void handle_roster_add(const char * const barejid, const char * const name);
void handle_autoping_cancel(void);
void handle_recipient_not_found(const char * const recipient, const char * const err_msg);
void handle_recipient_error(const char * const recipient, const char * const err_msg);
void handle_error(const char * const err_msg);
#endif

35
src/ui/core.c
View File

@ -387,6 +387,39 @@ _ui_handle_recipient_not_found(const char * const recipient, const char * const
g_string_free(msg, TRUE);
}
static void
_ui_handle_recipient_error(const char * const recipient, const char * const err_msg)
{
ProfWin *win = wins_get_by_recipient(recipient);
GString *msg = g_string_new("");
g_string_printf(msg, "Error from %s: %s", recipient, err_msg);
// always show in console
cons_show_error(msg->str);
// show in window if exists for recipient
if (win != NULL) {
win_print_line(win, '!', COLOUR_ERROR, msg->str);
}
wins_refresh_current();
g_string_free(msg, TRUE);
}
static void
_ui_handle_error(const char * const err_msg)
{
GString *msg = g_string_new("");
g_string_printf(msg, "Error %s", err_msg);
cons_show_error(msg->str);
wins_refresh_current();
g_string_free(msg, TRUE);
}
static void
_ui_disconnected(void)
{
@ -1752,4 +1785,6 @@ ui_init_module(void)
ui_chat_win_contact_online = _ui_chat_win_contact_online;
ui_chat_win_contact_offline = _ui_chat_win_contact_offline;
ui_handle_recipient_not_found = _ui_handle_recipient_not_found;
ui_handle_recipient_error = _ui_handle_recipient_error;
ui_handle_error = _ui_handle_error;
}

2
src/ui/ui.h
View File

@ -131,6 +131,8 @@ void (*ui_group_removed)(const char * const contact, const char * const group);
void (*ui_chat_win_contact_online)(PContact contact, Resource *resource, GDateTime *last_activity);
void (*ui_chat_win_contact_offline)(PContact contact, char *resource, char *status);
void (*ui_handle_recipient_not_found)(const char * const recipient, const char * const err_msg);
void (*ui_handle_recipient_error)(const char * const recipient, const char * const err_msg);
void (*ui_handle_error)(const char * const err_msg);
// contact status functions
void (*ui_status_room)(const char * const contact);

13
src/xmpp/message.c
View File

@ -193,9 +193,10 @@ static int
_message_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
{
// log message, function never returns NULL
char *id = xmpp_stanza_get_id(stanza);
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
// stanza_get_error never returns NULL
char *err_msg = stanza_get_error_message(stanza);
GString *log_msg = g_string_new("Error receievd");
@ -211,7 +212,7 @@ _message_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
}
g_string_append(log_msg, ", error: ");
g_string_append(log_msg, err_msg);
log_info(log_msg->str);
g_string_free(log_msg, TRUE);
@ -225,6 +226,14 @@ _message_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
// handle recipient not found ('from' contains a value and type is 'cancel')
if ((from != NULL) && ((type != NULL && (strcmp(type, "cancel") == 0)))) {
handle_recipient_not_found(from, err_msg);
// handle any other error from recipient
} else if (from != NULL) {
handle_recipient_error(from, err_msg);
// handle errors from no recipient
} else {
handle_error(err_msg);
}
return 1;