diff options
author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-28 01:34:44 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-28 01:34:44 +0800 |
commit | 891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35 (patch) | |
tree | ff5389343502b4121a6eebb5496edb6d83d52245 /megaphone | |
parent | 1403c791daa33f39c3dc86917c2f133ced2ae8f4 (diff) | |
download | gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.tar gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.tar.gz gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.tar.bz2 gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.tar.lz gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.tar.xz gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.tar.zst gsoc2013-empathy-891dd64e17fe816e6bab0b1e1d3ea35eb61a2e35.zip |
Move avatar cache to ~/.cache and don't mix avatar from different contacts, tokens are not garanteed to be different.
svn path=/trunk/; revision=1128
Diffstat (limited to 'megaphone')
-rw-r--r-- | megaphone/src/megaphone-applet.c | 6 |
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; |