From 7f5b563a8164360034949e302c7715cddd4490c1 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 2 Nov 2015 21:11:47 +0000 Subject: Removed ui_handle_room_join_error --- src/ui/core.c | 6 ------ src/ui/ui.h | 1 - src/xmpp/presence.c | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') 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 @@ -867,12 +867,6 @@ ui_switch_to_room(const char *const roomjid) ui_focus_win(window); } -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) { 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; } -- cgit 1.4.1-2-gfad0 on value='author'>author
path: root/CHANGELOG
blob: 8078305d286e23040a70d7d7dbc4250b2c50deea (plain) (tree) 
81f5ac9e ^





d3bcb234 ^



81f5ac9e ^













90018274 ^






95e021ae ^



c928a9eb ^

95e021ae ^


















1
2
3
4
5

6
7
8

9
10
11
12
13
14
15
16
17
18
19
20
21

22
23
24
25
26
27

28
29
30

31

32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49