Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29806/src
Modified Files:
buddy_chat.c
Log Message:
This is the last one--I promise.
This time it wasn't even broken--just doing something differently.
I should take a nap.
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- buddy_chat.c 6 May 2002 17:05:14 -0000 1.145
+++ buddy_chat.c 6 May 2002 17:40:02 -0000 1.146
@@ -661,6 +661,8 @@
n = strlen(who);
g_strdown(who);
+ debug_printf("\n%s\n%s\n%s\n\n", gc->username, gc->displayname, message);
+
if ((p = strstr(msg, who)) != NULL) {
if (((p == msg) || !isalnum(*(p - 1))) && !isalnum(*(p + n))) {
g_free(who);
@@ -714,7 +716,7 @@
play_sound(SND_CHAT_YOU_SAY);
flag |= WFLAG_SEND;
} else {
- if (b->makesound)
+ if (b->makesound && !(sound_options & OPT_SOUND_CHAT_NICK))
play_sound(SND_CHAT_SAY);
flag |= WFLAG_RECV;
}
@@ -722,7 +724,7 @@
}
if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
- if (b->makesound && !(sound_options & OPT_SOUND_CHAT_SAY))
+ if (b->makesound)
play_sound(SND_CHAT_NICK);
flag |= WFLAG_NICK;
}
|
