1 files changed, 19 insertions, 16 deletions

diff --git a/src/capabilities.c b/src/capabilities.c
index 14a396a6e..620e3a6b4 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -440,7 +440,7 @@ void
 gabble_capability_set_update (GabbleCapabilitySet *target,
     const GabbleCapabilitySet *source)
 {
-  TpIntSet *ret;
+  TpIntset *ret;
   g_return_if_fail (target != NULL);
   g_return_if_fail (source != NULL);
 
@@ -600,16 +600,17 @@ gboolean
 gabble_capability_set_has_one (const GabbleCapabilitySet *caps,
     const GabbleCapabilitySet *alternatives)
 {
-  TpIntSetIter iter;
+  TpIntsetFastIter iter;
+  guint element;
 
   g_return_val_if_fail (caps != NULL, FALSE);
   g_return_val_if_fail (alternatives != NULL, FALSE);
 
-  tp_intset_iter_init (&iter, tp_handle_set_peek (alternatives->handles));
+  tp_intset_fast_iter_init (&iter, tp_handle_set_peek (alternatives->handles));
 
-  while (tp_intset_iter_next (&iter))
+  while (tp_intset_fast_iter_next (&iter, &element))
     {
-      if (tp_handle_set_is_member (caps->handles, iter.element))
+      if (tp_handle_set_is_member (caps->handles, element))
         {
           return TRUE;
         }
@@ -623,16 +624,17 @@ gboolean
 gabble_capability_set_at_least (const GabbleCapabilitySet *caps,
     const GabbleCapabilitySet *query)
 {
-  TpIntSetIter iter;
+  TpIntsetFastIter iter;
+  guint element;
 
   g_return_val_if_fail (caps != NULL, FALSE);
   g_return_val_if_fail (query != NULL, FALSE);
 
-  tp_intset_iter_init (&iter, tp_handle_set_peek (query->handles));
+  tp_intset_fast_iter_init (&iter, tp_handle_set_peek (query->handles));
 
-  while (tp_intset_iter_next (&iter))
+  while (tp_intset_fast_iter_next (&iter, &element))
     {
-      if (!tp_handle_set_is_member (caps->handles, iter.element))
+      if (!tp_handle_set_is_member (caps->handles, element))
         {
           return FALSE;
         }
@@ -657,16 +659,17 @@ void
 gabble_capability_set_foreach (const GabbleCapabilitySet *caps,
     GFunc func, gpointer user_data)
 {
-  TpIntSetIter iter;
+  TpIntsetFastIter iter;
+  guint element;
 
   g_return_if_fail (caps != NULL);
   g_return_if_fail (func != NULL);
 
-  tp_intset_iter_init (&iter, tp_handle_set_peek (caps->handles));
+  tp_intset_fast_iter_init (&iter, tp_handle_set_peek (caps->handles));
 
-  while (tp_intset_iter_next (&iter))
+  while (tp_intset_fast_iter_next (&iter, &element))
     {
-      const gchar *var = tp_handle_inspect (feature_handles, iter.element);
+      const gchar *var = tp_handle_inspect (feature_handles, element);
 
       g_return_if_fail (var != NULL);
 
@@ -677,10 +680,10 @@ gabble_capability_set_foreach (const GabbleCapabilitySet *caps,
 
 static void
 append_intset (GString *ret,
-    const TpIntSet *cap_ints,
+    const TpIntset *cap_ints,
     const gchar *indent)
 {
-  TpIntSetFastIter iter;
+  TpIntsetFastIter iter;
   guint element;
 
   tp_intset_fast_iter_init (&iter, cap_ints);
@@ -726,7 +729,7 @@ gabble_capability_set_dump_diff (const GabbleCapabilitySet *old_caps,
     const GabbleCapabilitySet *new_caps,
     const gchar *indent)
 {
-  TpIntSet *old_ints, *new_ints, *rem, *add;
+  TpIntset *old_ints, *new_ints, *rem, *add;
   GString *ret;
 
   g_return_val_if_fail (old_caps != NULL, NULL);