# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1166776168 0
# Node ID 2e3ffe29f9aee44c295c9011b56e7ba3e75b6459
# Parent  e711afcb9ff49b8a945d52eb75be90371c70033c
[gaim-migrate @ 18045]
We occasionally get to gaim_parse_oncoming() with a user_info indicating a NULL away message for a contact who (1) is away and is still away and (2) does actually have a message.  gaim_got_infoblock() will then be called shortly thereafter.

Check to ensure that the call to gaim_prpl_got_user_status() has some benefit other than potentially removing an appropriate away message; do the call if the status actually changes as a result.

This fixes an issue in which away messages would periodically flicker invisible and then visible again in the contact list for certain contacts.

committer: Tailor Script <tailor@pidgin.im>

diff -r e711afcb9ff4 -r 2e3ffe29f9ae libgaim/protocols/oscar/oscar.c
--- a/libgaim/protocols/oscar/oscar.c	Fri Dec 22 06:59:05 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Fri Dec 22 08:29:28 2006 +0000
@@ -1774,8 +1774,18 @@
 		g_free(message);
 	}
 	else
-		gaim_prpl_got_user_status(account, info->sn, status_id, NULL);
-
+	{
+		GaimBuddy *b = gaim_find_buddy(account, info->sn);
+		GaimStatus *status;
+		const char *active_status_id;
+		
+		status = gaim_presence_get_active_status(gaim_buddy_get_presence(b));
+		active_status_id = gaim_status_get_id(status);
+		
+		if (!active_status_id || strcmp(active_status_id, status_id))
+			gaim_prpl_got_user_status(account, info->sn, status_id, NULL);
+	}
+	
 	/* Login time stuff */
 	if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE)
 		signon = info->onlinesince;