[Telepathy-commits] [telepathy-mission-control/master] Let _get_avatar return NULL if there's no avatar set.

[Alberto Mardegan]

---
 src/mcd-account.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 8c4202d..8e078ba 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -760,6 +760,8 @@ get_avatar (TpSvcDBusProperties *self, const gchar *name, GValue *value)
     GValueArray *va;
 
     mcd_account_get_avatar (account, &avatar, &mime_type);
+    if (!avatar)
+        avatar = g_array_new (FALSE, FALSE, 1);
 
     type = dbus_g_type_get_struct ("GValueArray",
 				   dbus_g_type_get_collection ("GArray",
@@ -2100,9 +2102,6 @@ mcd_account_get_avatar (McdAccount *account, GArray **avatar,
 	}
     }
     g_free (filename);
-
-    if (!*avatar)
-	*avatar = g_array_new (FALSE, FALSE, 1);
 }
 
 void
-- 
1.5.6.5