Mercurial > pidgin

diff src/buddy_chat.c @ 3060:4f2f12bf4408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 3074] Code cleanups by Robert McQueen. Michael Golden replaced the multiple per-account signon windows with a single signon window showing the status of all your accounts committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Sat, 16 Mar 2002 00:32:53 +0000
parents b68c648618a3
children b17d773c3c80
line wrap: on
line diff
--- a/src/buddy_chat.c	Fri Mar 15 20:09:14 2002 +0000
+++ b/src/buddy_chat.c	Sat Mar 16 00:32:53 2002 +0000
@@ -706,16 +706,16 @@
 	if (!(flag & WFLAG_WHISPER)) {
 		str = g_strdup(normalize (who));
 		if (!g_strcasecmp(str, normalize(b->gc->username))) {
-			if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
-				play_sound(CHAT_YOU_SAY);
+			if (b->makesound)
+				play_sound(SND_CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
 		} else if (!g_strcasecmp(str, normalize(b->gc->displayname))) {
-			if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
-				play_sound(CHAT_YOU_SAY);
+			if (b->makesound)
+				play_sound(SND_CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
 		} else {
-			if (b->makesound && (sound_options & OPT_SOUND_CHAT_SAY))
-				play_sound(CHAT_SAY);
+			if (b->makesound)
+				play_sound(SND_CHAT_SAY);
 			flag |= WFLAG_RECV;
 		}
 		g_free(str);
@@ -923,8 +923,8 @@
 		   g_list_length(b->in_room) == 1 ? "person" : "people");
 	gtk_label_set_text(GTK_LABEL(b->count), tmp);
 
-	if (b->makesound && (sound_options & OPT_SOUND_CHAT_JOIN))
-		play_sound(CHAT_JOIN);
+	if (b->makesound)
+		play_sound(SND_CHAT_JOIN);
 
 	if (chat_options & OPT_CHAT_LOGON) {
 		g_snprintf(tmp, sizeof(tmp), _("%s entered the room."), name);
@@ -1035,8 +1035,8 @@
 		   g_list_length(b->in_room) == 1 ? "person" : "people");
 	gtk_label_set_text(GTK_LABEL(b->count), tmp);
 
-	if (b->makesound && (sound_options & OPT_SOUND_CHAT_PART))
-		play_sound(CHAT_LEAVE);
+	if (b->makesound)
+		play_sound(SND_CHAT_LEAVE);
 
 	if (chat_options & OPT_CHAT_LOGON) {
 		if (reason && *reason)