diff src/gtkconv.c @ 9704:767a8f0c5740

[gaim-migrate @ 10564] Gracie committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 07 Aug 2004 22:31:36 +0000
parents 267eab8f3fa4
children d4634f26ef9b
line wrap: on
line diff
--- a/src/gtkconv.c	Sat Aug 07 21:11:22 2004 +0000
+++ b/src/gtkconv.c	Sat Aug 07 22:31:36 2004 +0000
@@ -4959,13 +4959,13 @@
 
 	/* Play a sound, if specified in prefs. */
 	if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) &&
-		!gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus)) {
+		!gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus) &&
+		!(flags & GAIM_MESSAGE_DELAYED) &&
+		!(flags & GAIM_MESSAGE_SYSTEM)) {
+
 		if (!(flags & GAIM_MESSAGE_WHISPER) && (flags & GAIM_MESSAGE_SEND))
 			gaim_sound_play_event(GAIM_SOUND_CHAT_YOU_SAY);
-		else if ((flags & GAIM_MESSAGE_RECV) &&
-			!(flags & GAIM_MESSAGE_DELAYED) && 
-			!(flags & GAIM_MESSAGE_SYSTEM)) {
-				
+		else if (flags & GAIM_MESSAGE_RECV) {
 			if ((flags & GAIM_MESSAGE_NICK) &&
 				gaim_prefs_get_bool("/gaim/gtk/sound/enabled/nick_said")) {