aboutsummaryrefslogtreecommitdiffstats
path: root/megaphone
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-05-28 01:34:44 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-05-28 01:34:44 +0800
commit2087773d913ba19b9bb0c847d72383a29803253e (patch)
treeff5389343502b4121a6eebb5496edb6d83d52245 /megaphone
parent82dff1d06147badb85aa4d2c7a163fa92333026d (diff)
downloadgsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.tar
gsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.tar.gz
gsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.tar.bz2
gsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.tar.lz
gsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.tar.xz
gsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.tar.zst
gsoc2013-empathy-2087773d913ba19b9bb0c847d72383a29803253e.zip
Move avatar cache to ~/.cache and don't mix avatar from different contacts, tokens are not garanteed to be different.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1128 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'megaphone')
-rw-r--r--megaphone/src/megaphone-applet.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index 5deeb6c98..449bad320 100644
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -177,18 +177,16 @@ megaphone_applet_update_icon (MegaphoneApplet *applet)
"avatar_token",
NULL);
if (!G_STR_EMPTY (avatar_token)) {
- avatar = empathy_avatar_new_from_cache (avatar_token);
+ empathy_contact_load_avatar_cache (priv->contact, avatar_token);
+ avatar = empathy_contact_get_avatar (priv->contact);
}
g_free (avatar_token);
- } else {
- empathy_avatar_ref (avatar);
}
if (avatar) {
avatar_pixbuf = empathy_pixbuf_from_avatar_scaled (avatar,
priv->image_size - 2,
priv->image_size - 2);
- empathy_avatar_unref (avatar);
} else {
GtkIconTheme *icon_theme;