summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-05-15 16:58:14 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-05-15 16:58:14 +0200
commitd3bef8975f12a46e77eb8f8c53350ab7fc761cf6 (patch)
tree904da01828cc8ae9dbcbf4fd30ac9614b6fbbacd
parent994c3d74942e55ca6550f7b3341816642bccbb93 (diff)
downloadtelepathy-gabble-d3bef8975f12a46e77eb8f8c53350ab7fc761cf6.tar.gz
stop using tp_handle_set_to_array()
I took the fastest path for now.
-rw-r--r--src/muc-channel.c6
-rw-r--r--src/muc-factory.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 88c0b4b7e..d3b961d02 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -1639,7 +1639,8 @@ close_channel (GabbleMucChannel *chan, const gchar *reason,
tp_base_channel_destroyed (base);
}
- handles = tp_handle_set_to_array (chan->group.members);
+ handles = gabble_au_variant_to_garray (
+ tp_handle_set_to_variant (chan->group.members));
gabble_presence_cache_update_many (conn->presence_cache, handles,
NULL, GABBLE_PRESENCE_UNKNOWN, NULL, 0);
g_array_unref (handles);
@@ -3413,7 +3414,8 @@ gabble_muc_channel_add_member (GObject *obj,
set_remove_members = tp_intset_new ();
set_remote_pending = tp_intset_new ();
- arr_members = tp_handle_set_to_array (mixin->members);
+ arr_members = gabble_au_variant_to_garray (
+ tp_handle_set_to_variant (mixin->members));
if (arr_members->len > 0)
{
tp_intset_add (set_remove_members,
diff --git a/src/muc-factory.c b/src/muc-factory.c
index a1d2fb9b2..1eeef6473 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -1313,7 +1313,8 @@ handle_text_channel_request (GabbleMucFactory *self,
/* build new InitialInviteeHandles and InitialInviteeIDs */
/* FIXME: include Self Handle to comply with spec ? */
- final_handles = tp_handle_set_to_array (handles);
+ final_handles = gabble_au_variant_to_garray (
+ tp_handle_set_to_variant (handles));
final_ids = g_new0 (char *, final_handles->len + 1);
for (i = 0; i < final_handles->len; i++)