# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1165999557 0
# Node ID 8d2e6e9118e24eaf58313a0f731813935c609b5d
# Parent  d380e165cd27afffd180b90a9f0bc9e2732b73d8
[gaim-migrate @ 17982]
For oscar accounts, make sure our server-stored icon is updated
correctly in the event that the local user set a new icon while
this account was offline.

committer: Tailor Script <tailor@pidgin.im>

diff -r d380e165cd27 -r 8d2e6e9118e2 libgaim/protocols/oscar/oscar.c
--- a/libgaim/protocols/oscar/oscar.c	Wed Dec 13 08:44:10 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Wed Dec 13 08:45:57 2006 +0000
@@ -4697,6 +4697,7 @@
 	GaimBuddy *b;
 	struct aim_ssi_item *curitem;
 	guint32 tmp;
+	const char *icon_path, *cached_icon_path;
 	va_list ap;
 	guint16 fmtver, numitems;
 	guint32 timestamp;
@@ -4924,6 +4925,15 @@
 			   "ssi: activating server-stored buddy list\n");
 	aim_ssi_enable(od);
 
+	/*
+	 * Make sure our server-stored icon is updated correctly in
+	 * the event that the local user set a new icon while this
+	 * account was offline.
+	 */
+	icon_path = gaim_account_get_buddy_icon(account);
+	cached_icon_path = gaim_buddy_icons_get_full_path(icon_path);
+	oscar_set_icon(gc, cached_icon_path);
+
 	return 1;
 }