summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-12-17 10:56:32 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-12-17 10:56:32 +0000
commit42a0caaac49ebab5aff47ab1ffae00e905ef470e (patch)
tree80bcc5e80f7f4e3b24a13a1713e7b8668e7a70a7
parent173c5201aad8ca3fe733a992d74fdcff6101f09a (diff)
Use tp_intset_union_update to simplify TpBaseContactList
-rw-r--r--telepathy-glib/base-contact-list.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index 18a5f79f8..519c2f4ac 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -2100,16 +2100,10 @@ tp_base_contact_list_contacts_changed (TpBaseContactList *self,
if (removed != NULL)
{
- TpIntset *tmp;
guint i;
- tmp = unsub;
- unsub = tp_intset_union (tmp, tp_handle_set_peek (removed));
- tp_intset_destroy (tmp);
-
- tmp = unpub;
- unpub = tp_intset_union (tmp, tp_handle_set_peek (removed));
- tp_intset_destroy (tmp);
+ tp_intset_union_update (unsub, tp_handle_set_peek (removed));
+ tp_intset_union_update (unpub, tp_handle_set_peek (removed));
removals = tp_handle_set_to_array (removed);