From e77bd67b1c51f0399c918754ed7f7ab227c986e1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 2 May 2012 19:31:23 +0100
Subject: [PATCH 6/9] Get rid of the last few references to TpIntSet (it's now
 TpIntset)

---
 telepathy-glib/connection-internal.h |    2 +-
 telepathy-glib/connection.c          |    2 +-
 tests/lib/contact-list-manager.c     |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/telepathy-glib/connection-internal.h b/telepathy-glib/connection-internal.h
index 5cfb63b..54572cc 100644
--- a/telepathy-glib/connection-internal.h
+++ b/telepathy-glib/connection-internal.h
@@ -53,7 +53,7 @@ struct _TpConnectionPrivate {
 
     /* items are GQuarks that represent arguments to
      * Connection.AddClientInterests */
-    TpIntSet *interests;
+    TpIntset *interests;
 
     /* TpHandle => weak ref to TpContact */
     GHashTable *contacts;
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 2fa2faf..345ea93 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -1571,7 +1571,7 @@ tp_connection_dispose (GObject *object)
 
   if (self->priv->interests != NULL)
     {
-      TpIntSetIter iter = TP_INTSET_ITER_INIT (self->priv->interests);
+      TpIntsetIter iter = TP_INTSET_ITER_INIT (self->priv->interests);
       guint size = tp_intset_size (self->priv->interests);
       GPtrArray *strings;
 
diff --git a/tests/lib/contact-list-manager.c b/tests/lib/contact-list-manager.c
index 0b78281..638c92b 100644
--- a/tests/lib/contact-list-manager.c
+++ b/tests/lib/contact-list-manager.c
@@ -199,7 +199,7 @@ contact_list_dup_groups (TpBaseContactList *base)
 
   if (self->priv->groups != NULL)
     {
-      TpIntSetFastIter iter;
+      TpIntsetFastIter iter;
       TpHandle group;
 
       ret = g_ptr_array_sized_new (tp_handle_set_size (self->priv->groups) + 1);
@@ -231,7 +231,7 @@ contact_list_dup_contact_groups (TpBaseContactList *base,
 
   if (d != NULL && d->groups != NULL)
     {
-      TpIntSetFastIter iter;
+      TpIntsetFastIter iter;
       TpHandle group;
 
       ret = g_ptr_array_sized_new (tp_handle_set_size (d->groups) + 1);
@@ -297,7 +297,7 @@ contact_list_set_contact_groups_async (TpBaseContactList *base,
   TpIntset *set, *added_set, *removed_set;
   GPtrArray *added_names, *removed_names;
   GPtrArray *new_groups;
-  TpIntSetFastIter iter;
+  TpIntsetFastIter iter;
   TpHandle group_handle;
   guint i;
 
-- 
1.7.10