[next] telepathy-gabble: stop using tp_handle_set_to_array()
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Fri May 16 06:05:42 PDT 2014
Module: telepathy-gabble
Branch: next
Commit: d3bef8975f12a46e77eb8f8c53350ab7fc761cf6
URL: http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=d3bef8975f12a46e77eb8f8c53350ab7fc761cf6
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Thu May 15 16:58:14 2014 +0200
stop using tp_handle_set_to_array()
I took the fastest path for now.
---
src/muc-channel.c | 6 ++++--
src/muc-factory.c | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 88c0b4b..d3b961d 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 a1d2fb9..1eeef64 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++)
More information about the telepathy-commits
mailing list