diff src/server.c @ 3060:4f2f12bf4408

[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 1143524a2eaf
children cbb8b9b4ca4a
line wrap: on
line diff
--- a/src/server.c	Fri Mar 15 20:09:14 2002 +0000
+++ b/src/server.c	Sat Mar 16 00:32:53 2002 +0000
@@ -584,9 +584,9 @@
 				set_convo_gc(cnv, gc);
 			}
 			if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
-				play_sound(FIRST_RECEIVE);
-			else if (cnv->makesound && (sound_options & OPT_SOUND_RECV))
-				play_sound(RECEIVE);
+				play_sound(SND_FIRST_RECEIVE);
+			else if (cnv->makesound)
+				play_sound(SND_RECEIVE);
 
 			write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);
 		}
@@ -645,9 +645,9 @@
 			set_convo_gc(cnv, gc);
 		}
 		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
-			play_sound(FIRST_RECEIVE);
-		else if (cnv->makesound && (sound_options & OPT_SOUND_RECV))
-			play_sound(RECEIVE);
+			play_sound(SND_FIRST_RECEIVE);
+		else if (cnv->makesound)
+			play_sound(SND_RECEIVE);
 
 		set_convo_name(cnv, name);