From 29af5d4a3bef53e975981b9ea9b3bcaec31fa443 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:30:39 +0000 Subject: Renamed ui_room_history -> mucwin_history --- src/event/server_events.c | 2 +- src/ui/mucwin.c | 2 +- src/ui/ui.h | 2 +- tests/unittests/ui/stub_ui.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/event/server_events.c b/src/event/server_events.c index 5865d84c..5b99bdc1 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -155,7 +155,7 @@ void sv_ev_room_history(const char *const room_jid, const char *const nick, GDateTime *timestamp, const char *const message) { - ui_room_history(room_jid, nick, timestamp, message); + mucwin_history(room_jid, nick, timestamp, message); } void diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index 9035ee95..51d7e922 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -336,7 +336,7 @@ mucwin_nick_change(const char *const roomjid, const char *const nick) } void -ui_room_history(const char *const roomjid, const char *const nick, +mucwin_history(const char *const roomjid, const char *const nick, GDateTime *timestamp, const char *const message) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); diff --git a/src/ui/ui.h b/src/ui/ui.h index d6f81089..c870ea8b 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -105,7 +105,7 @@ void mucwin_occupant_affiliation_change(const char *const roomjid, const char *c void mucwin_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick, const char *const role, const char *const affiliation, const char *const actor, const char *const reason); void mucwin_roster(const char *const roomjid, GList *occupants, const char *const presence); -void ui_room_history(const char *const roomjid, const char *const nick, GDateTime *timestamp, +void mucwin_history(const char *const roomjid, const char *const nick, GDateTime *timestamp, const char *const message); void ui_room_message(const char *const roomjid, const char *const nick, const char *const message); void ui_room_subject(const char *const roomjid, const char *const nick, const char *const subject); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index e90c38c6..7ba6028a 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -204,7 +204,7 @@ void mucwin_occupant_affiliation_change(const char * const roomjid, const char * void mucwin_occupant_role_and_affiliation_change(const char * const roomjid, const char * const nick, const char * const role, const char * const affiliation, const char * const actor, const char * const reason) {} void mucwin_roster(const char * const roomjid, GList *occupants, const char * const presence) {} -void ui_room_history(const char * const roomjid, const char * const nick, +void mucwin_history(const char * const roomjid, const char * const nick, GDateTime *timestamp, const char * const message) {} void ui_room_message(const char * const roomjid, const char * const nick, const char * const message) {} -- cgit 1.4.1-2-gfad0