aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

mucwin_room_info_error takes ProfMucWin

Browse Source
This commit is contained in:
James Booth 2015-11-01 23:30:44 +00:00
parent cb587b0772
commit 363fda82c1
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/mucwin.c
View File

@ -143,14 +143,14 @@ mucwin_occupant_role_and_affiliation_change(ProfMucWin *mucwin, const char *cons
} }
void void
mucwin_room_info_error(const char *const roomjid, const char *const error) mucwin_room_info_error(ProfMucWin *mucwin, const char *const error)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); assert(mucwin != NULL);
if (window) {
ProfWin *window = (ProfWin*)mucwin;
win_vprint(window, '!', 0, NULL, 0, 0, "", "Room info request failed: %s", error); win_vprint(window, '!', 0, NULL, 0, 0, "", "Room info request failed: %s", error);
win_print(window, '-', 0, NULL, 0, 0, "", ""); win_print(window, '-', 0, NULL, 0, 0, "", "");
} }
}
void void
mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features) mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features)

2
src/ui/ui.h
View File

@ -181,7 +181,7 @@ void mucwin_requires_config(const char *const roomjid);
void mucwin_info(ProfMucWin *mucwin); void mucwin_info(ProfMucWin *mucwin);
void mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role); void mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role);
void mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation); void mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation);
void mucwin_room_info_error(const char *const roomjid, const char *const error); void mucwin_room_info_error(ProfMucWin *mucwin, const char *const error);
void mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features); void mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features);
void mucwin_occupant_kicked(const char *const roomjid, const char *const nick, const char *const actor, void mucwin_occupant_kicked(const char *const roomjid, const char *const nick, const char *const actor,
const char *const reason); const char *const reason);

6
src/xmpp/iq.c
View File

@ -54,6 +54,7 @@
#include "muc.h" #include "muc.h"
#include "profanity.h" #include "profanity.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "window_list.h"
#include "config/preferences.h" #include "config/preferences.h"
#include "event/server_events.h" #include "event/server_events.h"
#include "xmpp/capabilities.h" #include "xmpp/capabilities.h"
@ -1505,9 +1506,10 @@ _room_info_response_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) { if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
if (cb_data->display) { ProfMucWin *mucwin = wins_get_muc(cb_data->room);
if (mucwin && cb_data->display) {
char *error_message = stanza_get_error_message(stanza); char *error_message = stanza_get_error_message(stanza);
mucwin_room_info_error(cb_data->room, error_message); mucwin_room_info_error(mucwin, error_message);
free(error_message); free(error_message);
} }
free(cb_data->room); free(cb_data->room);

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

@ -214,7 +214,7 @@ void ui_room_destroy(const char * const roomjid) {}
void mucwin_info(ProfMucWin *mucwin) {} void mucwin_info(ProfMucWin *mucwin) {}
void mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role) {} void mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role) {}
void mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) {} void mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) {}
void mucwin_room_info_error(const char * const roomjid, const char * const error) {} void mucwin_room_info_error(ProfMucWin *mucwin, const char * const error) {}
void mucwin_room_disco_info(const char * const roomjid, GSList *identities, GSList *features) {} void mucwin_room_disco_info(const char * const roomjid, GSList *identities, GSList *features) {}
void ui_room_destroyed(const char * const roomjid, const char * const reason, const char * const new_jid, void ui_room_destroyed(const char * const roomjid, const char * const reason, const char * const new_jid,
const char * const password) {} const char * const password) {}