comparison src/buddy_chat.c @ 3223:e13e569299ae

[gaim-migrate @ 3240] This is the last one--I promise. This time it wasn't even broken--just doing something differently. I should take a nap. committer: Tailor Script <[e-mail]>

3222:ad8bdd73f2d6

	who = g_strdup(gc->username);
	n = strlen(who);
	g_strdown(who);

	if ((p = strstr(msg, who)) != NULL) {
		if (((p == msg) || !isalnum(*(p - 1))) && !isalnum(*(p + n))) {
			g_free(who);
			g_free(msg);
			return TRUE;

		} else if (!g_strcasecmp(str, normalize(b->gc->displayname))) {
			if (b->makesound)
				play_sound(SND_CHAT_YOU_SAY);
			flag |= WFLAG_SEND;
		} else {
			if (b->makesound)
				play_sound(SND_CHAT_SAY);
			flag |= WFLAG_RECV;
		}
		g_free(str);
	}

	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
		if (b->makesound && !(sound_options & OPT_SOUND_CHAT_SAY))
			play_sound(SND_CHAT_NICK);
		flag |= WFLAG_NICK;
	}
	write_to_conv(b, message, flag, who, mtime, -1);
}

3223:e13e569299ae

	who = g_strdup(gc->username);
	n = strlen(who);
	g_strdown(who);

	debug_printf("\n%s\n%s\n%s\n\n", gc->username, gc->displayname, message);

	if ((p = strstr(msg, who)) != NULL) {
		if (((p == msg) || !isalnum(*(p - 1))) && !isalnum(*(p + n))) {
			g_free(who);
			g_free(msg);
			return TRUE;

		} else if (!g_strcasecmp(str, normalize(b->gc->displayname))) {
			if (b->makesound)
				play_sound(SND_CHAT_YOU_SAY);
			flag |= WFLAG_SEND;
		} else {
			if (b->makesound && !(sound_options & OPT_SOUND_CHAT_NICK))
				play_sound(SND_CHAT_SAY);
			flag |= WFLAG_RECV;
		}
		g_free(str);
	}

	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
		if (b->makesound)
			play_sound(SND_CHAT_NICK);
		flag |= WFLAG_NICK;
	}
	write_to_conv(b, message, flag, who, mtime, -1);
}