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

mucwin_kick_error takes ProfMucWin

Browse Source
This commit is contained in:
James Booth 2015-11-02 00:33:31 +00:00
parent 23ada0d38b
commit 5c53c94253
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/mucwin.c
View File

@ -497,14 +497,12 @@ mucwin_subject(ProfMucWin *mucwin, const char *const nick, const char *const sub
} }
void void
mucwin_kick_error(const char *const roomjid, const char *const nick, const char *const error) mucwin_kick_error(ProfMucWin *mucwin, const char *const nick, const char *const error)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); assert(mucwin != NULL);
if (window == NULL) {
log_error("Kick error received for %s, but no window open for %s.", nick, roomjid); ProfWin *window = (ProfWin*)mucwin;
} else { win_vprint(window, '!', 0, NULL, 0, THEME_ERROR, "", "Error kicking %s: %s", nick, error);
win_vprint(window, '!', 0, NULL, 0, THEME_ERROR, "", "Error kicking %s: %s", nick, error);
}
} }
void void

2
src/ui/ui.h
View File

@ -206,7 +206,7 @@ void mucwin_role_set_error(const char *const roomjid, const char *const nick, co
const char *const error); const char *const error);
void mucwin_role_list_error(const char *const roomjid, const char *const role, const char *const error); void mucwin_role_list_error(const char *const roomjid, const char *const role, const char *const error);
void mucwin_handle_role_list(const char *const roomjid, const char *const role, GSList *nicks); void mucwin_handle_role_list(const char *const roomjid, const char *const role, GSList *nicks);
void mucwin_kick_error(const char *const roomjid, const char *const nick, const char *const error); void mucwin_kick_error(ProfMucWin *mucwin, const char *const nick, const char *const error);
// xml console // xml console
void xmlwin_show(ProfXMLWin *xmlwin, const char *const msg); void xmlwin_show(ProfXMLWin *xmlwin, const char *const msg);

7
src/xmpp/iq.c
View File

@ -1462,12 +1462,11 @@ _room_kick_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza,
} }
// handle error responses // handle error responses
if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { ProfMucWin *mucwin = wins_get_muc(from);
if (mucwin && (g_strcmp0(type, STANZA_TYPE_ERROR) == 0)) {
char *error_message = stanza_get_error_message(stanza); char *error_message = stanza_get_error_message(stanza);
mucwin_kick_error(from, nick, error_message); mucwin_kick_error(mucwin, nick, error_message);
free(error_message); free(error_message);
free(nick);
return 0;
} }
free(nick); free(nick);

2
tests/unittests/ui/stub_ui.c
View File

@ -281,7 +281,7 @@ void mucwin_role_set_error(const char * const roomjid, const char * const nick,
const char * const error) {} const char * const error) {}
void mucwin_role_list_error(const char * const roomjid, const char * const role, const char * const error) {} void mucwin_role_list_error(const char * const roomjid, const char * const role, const char * const error) {}
void mucwin_handle_role_list(const char * const roomjid, const char * const role, GSList *nicks) {} void mucwin_handle_role_list(const char * const roomjid, const char * const role, GSList *nicks) {}
void mucwin_kick_error(const char * const roomjid, const char * const nick, const char * const error) {} void mucwin_kick_error(ProfMucWin *mucwin, const char * const nick, const char * const error) {}
void ui_show_form(ProfMucConfWin *confwin) {} void ui_show_form(ProfMucConfWin *confwin) {}
void ui_show_form_field(ProfWin *window, DataForm *form, char *tag) {} void ui_show_form_field(ProfWin *window, DataForm *form, char *tag) {}
void ui_show_form_help(ProfMucConfWin *confwin) {} void ui_show_form_help(ProfMucConfWin *confwin) {}