comparison src/server.c @ 3521:f3981f94494a

[gaim-migrate @ 3594] Play the sounds even if we're queuing them up. This way at least we'll know you have a message waiting. committer: Tailor Script <[e-mail]>

3520:0cf6fee378fc

		g_free(tmpmsg);
	} else {
		/* 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 (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. */
			struct queued_message *qm;
			qm = g_new0(struct queued_message, 1);

		} else {
			if (cnv == NULL) {
				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);
		}
	}

3521:f3981f94494a

		g_free(tmpmsg);
	} else {
		/* 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. */
			struct queued_message *qm;
			qm = g_new0(struct queued_message, 1);

		} else {
			if (cnv == NULL) {
				cnv = new_conversation(name);
				set_convo_gc(cnv, gc);
			}
						
			set_convo_name(cnv, name);
			
			write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);
		}
	}