diff options
-rw-r--r-- | src/ui/core.c | 6 | ||||
-rw-r--r-- | src/ui/ui.h | 1 | ||||
-rw-r--r-- | src/xmpp/presence.c | 2 | ||||
-rw-r--r-- | tests/unittests/ui/stub_ui.c | 1 |
4 files changed, 1 insertions, 9 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index 6dc85827..37bc5b15 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -868,12 +868,6 @@ ui_switch_to_room(const char *const roomjid) } void -ui_handle_room_join_error(const char *const roomjid, const char *const err) -{ - cons_show_error("Error joining room %s, reason: %s", roomjid, err); -} - -void ui_room_destroy(const char *const roomjid) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); diff --git a/src/ui/ui.h b/src/ui/ui.h index 87e0f30f..eecafe97 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -109,7 +109,6 @@ void ui_handle_recipient_error(const char *const recipient, const char *const er void ui_handle_error(const char *const err_msg); void ui_clear_win_title(void); void ui_goodbye_title(void); -void ui_handle_room_join_error(const char *const roomjid, const char *const err); void ui_handle_room_configuration(const char *const roomjid, DataForm *form); void ui_handle_room_configuration_form_error(const char *const roomjid, const char *const message); void ui_handle_room_config_submit_result(const char *const roomjid); diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index e335dbff..0743cbe2 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -390,7 +390,7 @@ _presence_error_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, if (muc_active(fulljid->barejid)) { muc_leave(fulljid->barejid); } - ui_handle_room_join_error(fulljid->barejid, error_cond); + cons_show_error("Error joining room %s, reason: %s", fulljid->barejid, error_cond); jid_destroy(fulljid); return 1; } diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 900ab2df..b7c34f14 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -250,7 +250,6 @@ void ui_handle_error(const char * const err_msg) void ui_clear_win_title(void) {} void ui_goodbye_title(void) {} -void ui_handle_room_join_error(const char * const roomjid, const char * const err) {} void ui_handle_room_configuration(const char * const roomjid, DataForm *form) {} void ui_handle_room_configuration_form_error(const char * const roomjid, const char * const message) {} void ui_handle_room_config_submit_result(const char * const roomjid) {} |