devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-22 15:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into winbuffers

Browse Source 
Conflicts:
	src/ui/core.c
This commit is contained in:
James Booth
2014-07-16 20:03:08 +01:00
parent 5872c4b554 4624eabb75
commit aa8872875f
4 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/core.c
View File

@@ -1595,9 +1595,14 @@ _ui_room_message(const char * const room_jid, const char * const nick,
{
ProfWin *window = wins_get_by_recipient(room_jid);
int num = wins_get_num(window);
char *my_nick = muc_get_room_nick(room_jid);
if (strcmp(nick, muc_get_room_nick(room_jid)) != 0) {
win_save_print(window, '-', NULL, 1, 0, nick, message);
if (strcmp(nick, my_nick) != 0) {
if (g_strrstr(message, my_nick) != NULL) {
win_save_print(window, '-', NULL, 1, COLOUR_ROOMMENTION, nick, message);
} else {
win_save_print(window, '-', NULL, 1, 0, nick, message);
}
} else {
win_save_print(window, '-', NULL, 0, 0, nick, message);
}
@@ -1616,7 +1621,7 @@ _ui_room_message(const char * const room_jid, const char * const nick,
win_update_virtual(current);
}
if (strcmp(nick, muc_get_room_nick(room_jid)) != 0) {
if (strcmp(nick, my_nick) != 0) {
if (prefs_get_boolean(PREF_FLASH)) {
flash();
}