comparison libpurple/protocols/jabber/message.c @ 29309:974748d0e1f2

jabber: Don't pre-create a conversation on an incoming attention Prevents a conversation popping up despite "Hide new IM"

29308:430badc49904

static void handle_buzz(JabberMessage *jm) {
	PurpleBuddy *buddy;
	PurpleAccount *account;
	PurpleConversation *c;
	char *username;

	/* Delayed buzz MUST NOT be accepted */
	if(jm->delayed)
		return;

	account = purple_connection_get_account(jm->js->gc);

	if ((buddy = purple_find_buddy(account, jm->from)) == NULL)
		return; /* Do not accept buzzes from unknown people */

	c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, jm->from, account);
	if (c == NULL)
		c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, jm->from);

	username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
	/* xmpp only has 1 attention type, so index is 0 */
	purple_prpl_got_attention(jm->js->gc, jm->from, 0);
	purple_conversation_attention(c, jm->from, 0, PURPLE_MESSAGE_RECV, time(NULL));

	g_free(username);
}

/* used internally by the functions below */
typedef struct {
	gchar *cid;

29309:974748d0e1f2

static void handle_buzz(JabberMessage *jm) {
	PurpleBuddy *buddy;
	PurpleAccount *account;
	PurpleConversation *c;

	/* Delayed buzz MUST NOT be accepted */
	if(jm->delayed)
		return;

	account = purple_connection_get_account(jm->js->gc);

	if ((buddy = purple_find_buddy(account, jm->from)) == NULL)
		return; /* Do not accept buzzes from unknown people */

	/* xmpp only has 1 attention type, so index is 0 */
	purple_prpl_got_attention(jm->js->gc, jm->from, 0);
	c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, jm->from, account);
	if (c)
		purple_conversation_attention(c, jm->from, 0, PURPLE_MESSAGE_RECV, time(NULL));
}

/* used internally by the functions below */
typedef struct {
	gchar *cid;