[next] telepathy-gabble: pass a TpMutableContactList to vfunc functions

Simon McVittie smcv at kemper.freedesktop.org
Wed Sep 17 05:39:49 PDT 2014


Module: telepathy-gabble
Branch: next
Commit: f643ecedc6d7407b2d0c95327b81abc2899a3391
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=f643ecedc6d7407b2d0c95327b81abc2899a3391

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon May 26 15:14:34 2014 +0200

pass a TpMutableContactList to vfunc functions

---

 src/roster.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/roster.c b/src/roster.c
index 0335ea1..d38fb12 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -2717,7 +2717,7 @@ gabble_roster_request_subscription_added_cb (GObject *source,
 }
 
 static void
-gabble_roster_request_subscription_async (TpBaseContactList *base,
+gabble_roster_request_subscription_async (TpMutableContactList *base,
     TpHandleSet *contacts,
     const gchar *message,
     GAsyncReadyCallback callback,
@@ -2750,7 +2750,7 @@ gabble_roster_request_subscription_async (TpBaseContactList *base,
 }
 
 static void
-gabble_roster_authorize_publication_async (TpBaseContactList *base,
+gabble_roster_authorize_publication_async (TpMutableContactList *base,
     TpHandleSet *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -2803,7 +2803,7 @@ gabble_roster_authorize_publication_async (TpBaseContactList *base,
 }
 
 static void
-gabble_roster_store_contacts_async (TpBaseContactList *base,
+gabble_roster_store_contacts_async (TpMutableContactList *base,
     TpHandleSet *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -2824,7 +2824,7 @@ gabble_roster_store_contacts_async (TpBaseContactList *base,
 }
 
 static void
-gabble_roster_remove_contacts_async (TpBaseContactList *base,
+gabble_roster_remove_contacts_async (TpMutableContactList *base,
     TpHandleSet *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -2845,7 +2845,7 @@ gabble_roster_remove_contacts_async (TpBaseContactList *base,
 }
 
 static void
-gabble_roster_unsubscribe_async (TpBaseContactList *base,
+gabble_roster_unsubscribe_async (TpMutableContactList *base,
     TpHandleSet *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -2897,7 +2897,8 @@ gabble_roster_unsubscribe_async (TpBaseContactList *base,
         }
     }
 
-  tp_base_contact_list_contacts_changed (base, changed, removed);
+  tp_base_contact_list_contacts_changed (TP_BASE_CONTACT_LIST (base), changed,
+      removed);
   gabble_simple_async_succeed_or_fail_in_idle (self, callback, user_data,
       gabble_roster_unsubscribe_async, error);
   g_clear_error (&error);
@@ -2906,7 +2907,7 @@ gabble_roster_unsubscribe_async (TpBaseContactList *base,
 }
 
 static void
-gabble_roster_unpublish_async (TpBaseContactList *base,
+gabble_roster_unpublish_async (TpMutableContactList *base,
     TpHandleSet *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -2974,7 +2975,8 @@ gabble_roster_unpublish_async (TpBaseContactList *base,
         }
     }
 
-  tp_base_contact_list_contacts_changed (base, changed, removed);
+  tp_base_contact_list_contacts_changed (TP_BASE_CONTACT_LIST (base), changed,
+      removed);
   gabble_simple_async_succeed_or_fail_in_idle (self, callback, user_data,
       gabble_roster_unpublish_async, error);
   g_clear_error (&error);



More information about the telepathy-commits mailing list