diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-23 14:00:30 +0000 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-23 14:34:00 +0000 |
| commit | 20dd3263a10b75a678088a80810cdb9cef480563 (patch) | |
| tree | 8c1c4ff327eaac8acda074ff440bb3ad2bca99b5 | |
| parent | ac978e5e11a94ce25458605bb16ca4d218686c5a (diff) | |
Use the correct types for tp_asv_get_boxed
| -rw-r--r-- | telepathy-yell/call-channel.c | 13 | ||||
| -rw-r--r-- | telepathy-yell/call-stream.c | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/telepathy-yell/call-channel.c b/telepathy-yell/call-channel.c index 968f0d5..6d6d48d 100644 --- a/telepathy-yell/call-channel.c +++ b/telepathy-yell/call-channel.c @@ -243,16 +243,19 @@ on_call_channel_get_all_properties_cb (TpProxy *proxy, "InitialVideo", NULL); hash_table = tp_asv_get_boxed (properties, - "CallStateDetails", G_TYPE_HASH_TABLE); + "CallStateDetails", TP_HASH_TYPE_STRING_VARIANT_MAP); if (hash_table != NULL) - self->priv->details = g_boxed_copy (G_TYPE_HASH_TABLE, hash_table); + self->priv->details = g_boxed_copy (TP_HASH_TYPE_STRING_VARIANT_MAP, + hash_table); hash_table = tp_asv_get_boxed (properties, - "CallMembers", G_TYPE_HASH_TABLE); + "CallMembers", TPY_HASH_TYPE_CALL_MEMBER_MAP); if (hash_table != NULL) - self->priv->members = g_boxed_copy (G_TYPE_HASH_TABLE, hash_table); + self->priv->members = g_boxed_copy (TPY_HASH_TYPE_CALL_MEMBER_MAP, + hash_table); - contents = tp_asv_get_boxed (properties, "Contents", G_TYPE_PTR_ARRAY); + contents = tp_asv_get_boxed (properties, + "Contents", TP_ARRAY_TYPE_OBJECT_PATH_LIST); for (i = 0; i < contents->len; i++) { diff --git a/telepathy-yell/call-stream.c b/telepathy-yell/call-stream.c index 2ddd3a0..3b313e0 100644 --- a/telepathy-yell/call-stream.c +++ b/telepathy-yell/call-stream.c @@ -69,9 +69,11 @@ on_call_stream_get_all_properties_cb (TpProxy *proxy, "CanRequestReceiving", NULL); tp_clear_pointer (&self->priv->remote_members, g_hash_table_unref); - members = tp_asv_get_boxed (properties, "RemoteMembers", G_TYPE_HASH_TABLE); + members = tp_asv_get_boxed (properties, + "RemoteMembers", TPY_HASH_TYPE_CALL_MEMBER_MAP); if (members != NULL) - self->priv->remote_members = g_boxed_copy (G_TYPE_HASH_TABLE, members); + self->priv->remote_members = + g_boxed_copy (TPY_HASH_TYPE_CALL_MEMBER_MAP, members); } static void |