[telepathy-mission-control/master] McdAccount: use MC_STRUCT_TYPE_AVATAR instead of reinventing it

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Jun 10 03:43:25 PDT 2009


---
 src/mcd-account.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 89d32c0..b891676 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -990,18 +990,13 @@ get_avatar (TpSvcDBusProperties *self, const gchar *name, GValue *value)
     McdAccount *account = MCD_ACCOUNT (self);
     gchar *mime_type;
     GArray *avatar = NULL;
-    GType type;
+    GType type = MC_STRUCT_TYPE_AVATAR;
     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",
-							       G_TYPE_UCHAR),
-				   G_TYPE_STRING,
-				   G_TYPE_INVALID);
     g_value_init (value, type);
     g_value_take_boxed (value, dbus_g_type_specialized_construct (type));
     va = (GValueArray *) g_value_get_boxed (value);
-- 
1.5.6.5




More information about the telepathy-commits mailing list