aniani/profanity
0
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-07-24 17:34:39 -04:00
Code

Renamed ui_room_roster -> mucwin_roster

Browse Source
This commit is contained in:
James Booth 2015-11-01 21:20:11 +00:00
parent fdd00b33a4
commit 51c9d4186e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/commands.c
View File

@ -1158,7 +1158,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
// no arg, show all contacts // no arg, show all contacts
if ((presence == NULL) || (g_strcmp0(presence, "any") == 0)) { if ((presence == NULL) || (g_strcmp0(presence, "any") == 0)) {
ui_room_roster(mucwin->roomjid, occupants, NULL); mucwin_roster(mucwin->roomjid, occupants, NULL);
// available // available
} else if (strcmp("available", presence) == 0) { } else if (strcmp("available", presence) == 0) {
@ -1172,7 +1172,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
occupants = g_list_next(occupants); occupants = g_list_next(occupants);
} }
ui_room_roster(mucwin->roomjid, filtered, "available"); mucwin_roster(mucwin->roomjid, filtered, "available");
// unavailable // unavailable
} else if (strcmp("unavailable", presence) == 0) { } else if (strcmp("unavailable", presence) == 0) {
@ -1186,7 +1186,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
occupants = g_list_next(occupants); occupants = g_list_next(occupants);
} }
ui_room_roster(mucwin->roomjid, filtered, "unavailable"); mucwin_roster(mucwin->roomjid, filtered, "unavailable");
// show specific status // show specific status
} else { } else {
@ -1201,7 +1201,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
occupants = g_list_next(occupants); occupants = g_list_next(occupants);
} }
ui_room_roster(mucwin->roomjid, filtered, presence); mucwin_roster(mucwin->roomjid, filtered, presence);
} }
g_list_free(occupants); g_list_free(occupants);

2
src/event/server_events.c
View File

@ -559,7 +559,7 @@ sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean c
// show roster if occupants list disabled by default // show roster if occupants list disabled by default
if (!prefs_get_boolean(PREF_OCCUPANTS)) { if (!prefs_get_boolean(PREF_OCCUPANTS)) {
GList *occupants = muc_roster(room); GList *occupants = muc_roster(room);
ui_room_roster(room, occupants, NULL); mucwin_roster(room, occupants, NULL);
g_list_free(occupants); g_list_free(occupants);
} }

2
src/ui/mucwin.c
View File

@ -181,7 +181,7 @@ mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *fe
} }
void void
ui_room_roster(const char *const roomjid, GList *roster, const char *const presence) mucwin_roster(const char *const roomjid, GList *roster, const char *const presence)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
if (window == NULL) { if (window == NULL) {

2
src/ui/ui.h
View File

@ -104,7 +104,7 @@ void mucwin_occupant_affiliation_change(const char *const roomjid, const char *c
const char *const affiliation, const char *const actor, const char *const reason); const char *const affiliation, const char *const actor, const char *const reason);
void mucwin_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick, 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); const char *const role, const char *const affiliation, const char *const actor, const char *const reason);
void ui_room_roster(const char *const roomjid, GList *occupants, const char *const presence); 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 ui_room_history(const char *const roomjid, const char *const nick, GDateTime *timestamp,
const char *const message); const char *const message);
void ui_room_message(const char *const roomjid, const char *const nick, const char *const message); void ui_room_message(const char *const roomjid, const char *const nick, const char *const message);

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

@ -203,7 +203,7 @@ void mucwin_occupant_affiliation_change(const char * const roomjid, const char *
const char * const actor, const char * const reason) {} const char * const actor, const char * const reason) {}
void mucwin_occupant_role_and_affiliation_change(const char * const roomjid, const char * const nick, const char * const role, 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) {} const char * const affiliation, const char * const actor, const char * const reason) {}
void ui_room_roster(const char * const roomjid, GList *occupants, const char * const presence) {} 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 ui_room_history(const char * const roomjid, const char * const nick,
GDateTime *timestamp, const char * const message) {} GDateTime *timestamp, const char * const message) {}
void ui_room_message(const char * const roomjid, const char * const nick, void ui_room_message(const char * const roomjid, const char * const nick,