aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2009-08-29 22:19:23 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2009-08-31 23:20:55 +0800
commit0897839d5bffb9458abd5d2de2dcf0c1d09707ab (patch)
treed3a453cb423bfff05347ae568c7b51fdd9a0539e
parent3c59ec5f8fc6de5c9be1fdd1638859a151bb6537 (diff)
downloadgsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.tar
gsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.tar.gz
gsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.tar.bz2
gsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.tar.lz
gsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.tar.xz
gsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.tar.zst
gsoc2013-empathy-0897839d5bffb9458abd5d2de2dcf0c1d09707ab.zip
Fall back to the default icon if an empty icon name is set
-rw-r--r--libempathy/empathy-account.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
index 175bea64d..fb1b2756d 100644
--- a/libempathy/empathy-account.c
+++ b/libempathy/empathy-account.c
@@ -246,11 +246,12 @@ empathy_account_update (EmpathyAccount *account,
icon_name = tp_asv_get_string (properties, "Icon");
- if (!EMP_STR_EMPTY (icon_name))
- {
- g_free (priv->icon_name);
- priv->icon_name = g_strdup (icon_name);
- }
+ g_free (priv->icon_name);
+
+ if (EMP_STR_EMPTY (icon_name))
+ priv->icon_name = empathy_protocol_icon_name (priv->proto_name);
+ else
+ priv->icon_name = g_strdup (icon_name);
}
if (g_hash_table_lookup (properties, "Enabled") != NULL)