[empathy] Fall back to the default icon if an empty icon name is set
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] Fall back to the default icon if an empty icon name is set
- Date: Mon, 31 Aug 2009 15:31:38 +0000 (UTC)
commit 0897839d5bffb9458abd5d2de2dcf0c1d09707ab
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Aug 29 16:19:23 2009 +0200
Fall back to the default icon if an empty icon name is set
libempathy/empathy-account.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
index 175bea6..fb1b275 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]