telepathy-mission-control: Use TpIntset instead of long-deprecated alias TpIntSet

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: e0d36e4bb93119d5c23cc437a2fefd40675af034
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=e0d36e4bb93119d5c23cc437a2fefd40675af034

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May  7 19:22:34 2012 +0100

Use TpIntset instead of long-deprecated alias TpIntSet

---

 src/mcd-connection-priv.h           |    2 +-
 src/mcd-connection-service-points.c |    2 +-
 src/mcd-connection.c                |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mcd-connection-priv.h b/src/mcd-connection-priv.h
index be811e1..8860e29 100644
--- a/src/mcd-connection-priv.h
+++ b/src/mcd-connection-priv.h
@@ -62,7 +62,7 @@ G_GNUC_INTERNAL void _mcd_connection_take_emergency_numbers (McdConnection *self
     GSList *numbers);
 
 G_GNUC_INTERNAL void _mcd_connection_take_emergency_handles (McdConnection *self,
-    TpIntSet *handles);
+    TpIntset *handles);
 
 G_GNUC_INTERNAL void _mcd_connection_clear_emergency_data (McdConnection *self);
 
diff --git a/src/mcd-connection-service-points.c b/src/mcd-connection-service-points.c
index b869f4c..1c2d231 100644
--- a/src/mcd-connection-service-points.c
+++ b/src/mcd-connection-service-points.c
@@ -39,7 +39,7 @@ service_handles_fetched_cb (TpConnection *tp_conn,
 {
   guint i;
   McdConnection *connection = MCD_CONNECTION (weak);
-  TpIntSet *e_handles = tp_intset_new ();
+  TpIntset *e_handles = tp_intset_new ();
 
   if (error != NULL)
     return;
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index d344bba..24f945d 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -140,7 +140,7 @@ struct _McdConnectionPrivate
 
     struct
     {
-        TpIntSet *handles;
+        TpIntset *handles;
         GSList *numbers;
     } emergency;
 };
@@ -2815,7 +2815,7 @@ static void clear_emergency_handles (McdConnectionPrivate *priv)
   /* trawl through the handles and unref them */
   if (n_handles > 0)
     {
-      TpIntSetFastIter iter;
+      TpIntsetFastIter iter;
       TpHandle *handles = g_new0 (TpHandle, n_handles);
       TpHandle handle;
       guint i = 0;
@@ -2860,7 +2860,7 @@ void _mcd_connection_take_emergency_numbers (McdConnection *self, GSList *number
 }
 
 void
-_mcd_connection_take_emergency_handles (McdConnection *self, TpIntSet *handles)
+_mcd_connection_take_emergency_handles (McdConnection *self, TpIntset *handles)
 {
     McdConnectionPrivate *priv = self->priv;