[next] telepathy-glib: pass a TpMutableContactGroupList to get_group_storage() vfunc

Simon McVittie smcv at kemper.freedesktop.org
Wed Sep 17 05:22:52 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 2f45254a0d0d68d8b28ec885bad22c15a7fda4e0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=2f45254a0d0d68d8b28ec885bad22c15a7fda4e0

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue May 27 16:07:42 2014 +0200

pass a TpMutableContactGroupList to get_group_storage() vfunc

---

 docs/reference/telepathy-glib/telepathy-glib-sections.txt |    2 +-
 examples/cm/contactlist/contact-list.c                    |    2 +-
 telepathy-glib/base-contact-list.c                        |    4 ++--
 telepathy-glib/base-contact-list.h                        |    6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index f894355..08f17e7 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4902,7 +4902,7 @@ TpBaseContactListDupContactsFunc
 tp_base_contact_list_dup_contacts
 TpBaseContactListDupStatesFunc
 tp_base_contact_list_dup_states
-TpBaseContactListUIntFunc
+TpMutableContactGroupListUIntFunc
 TpBaseContactListAsyncFunc
 TpBaseContactListAsyncFinishFunc
 tp_base_contact_list_download_async
diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c
index 877174d..2107d36 100644
--- a/examples/cm/contactlist/contact-list.c
+++ b/examples/cm/contactlist/contact-list.c
@@ -1542,7 +1542,7 @@ example_contact_list_unblock_contacts_async (
 
 static guint
 example_contact_list_get_group_storage (
-    TpBaseContactList *contact_list G_GNUC_UNUSED)
+    TpMutableContactGroupList *contact_list G_GNUC_UNUSED)
 {
   return TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE;
 }
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index 3de6f35..b8c4d6f 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -4635,7 +4635,7 @@ _tp_base_contact_list_implement_contact_list (TpBaseContactList *self)
 }
 
 /**
- * TpBaseContactListUIntFunc:
+ * TpMutableContactGroupListUIntFunc:
  * @self: a contact list manager
  *
  * Signature of a virtual method that returns an unsigned integer result.
@@ -4687,7 +4687,7 @@ tp_base_contact_list_get_group_storage (TpBaseContactList *self)
   if (iface->get_group_storage == NULL)
     return TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE;
 
-  return iface->get_group_storage (self);
+  return iface->get_group_storage (TP_MUTABLE_CONTACT_GROUP_LIST (self));
 }
 
 static void
diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h
index c98c40b..3867197 100644
--- a/telepathy-glib/base-contact-list.h
+++ b/telepathy-glib/base-contact-list.h
@@ -518,8 +518,8 @@ typedef gboolean (*TpMutableContactGroupListAsyncFinishFunc) (
     GAsyncResult *result,
     GError **error);
 
-typedef guint (*TpBaseContactListUIntFunc) (
-    TpBaseContactList *self);
+typedef guint (*TpMutableContactGroupListUIntFunc) (
+    TpMutableContactGroupList *self);
 
 TpContactMetadataStorageType tp_base_contact_list_get_group_storage (
     TpBaseContactList *self);
@@ -668,7 +668,7 @@ struct _TpMutableContactGroupListInterface {
 
     TpMutableContactGroupListRenameGroupFunc rename_group_async;
     TpMutableContactGroupListAsyncFinishFunc rename_group_finish;
-    TpBaseContactListUIntFunc get_group_storage;
+    TpMutableContactGroupListUIntFunc get_group_storage;
 };
 
 _TP_AVAILABLE_IN_1_0



More information about the telepathy-commits mailing list