[Gaim-commits] CVS: gaim/src server.c,1.236,1.237

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv11015/src

Modified Files:
	server.c 
Log Message:
Play the sounds even if we're queuing them up.  This way at least we'll
know you have a message waiting.



Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- server.c	16 Sep 2002 08:35:24 -0000	1.236
+++ server.c	16 Sep 2002 18:13:45 -0000	1.237
@@ -688,6 +688,12 @@
 		/* we're not away. this is easy. if the convo window doesn't exist, create and update
 		 * it (if it does exist it was updated earlier), then play a sound indicating we've
 		 * received it and then display it. easy. */
+		
+		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
+			play_sound(SND_FIRST_RECEIVE);
+		else if (cnv->makesound)
+			play_sound(SND_RECEIVE);
+		
 		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) {
 			/* We're gonna queue it up and wait for the user to ask for it... probably
 			 * by clicking the docklet or windows tray icon. */
@@ -705,11 +711,7 @@
 				cnv = new_conversation(name);
 				set_convo_gc(cnv, gc);
 			}
-			if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
-				play_sound(SND_FIRST_RECEIVE);
-			else if (cnv->makesound)
-				play_sound(SND_RECEIVE);
-			
+						
 			set_convo_name(cnv, name);
 			
 			write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);