From 99bde0cffd0a5e2b0f7c0d1b211b90e8461bb530 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 16 May 2014 10:18:36 +0200
Subject: [PATCH 10/10] move tp_handle_set_to_array() as private API

---
 docs/reference/telepathy-glib/telepathy-glib-sections.txt | 1 -
 telepathy-glib/base-contact-list.c                        | 2 +-
 telepathy-glib/group-mixin.c                              | 6 ++++--
 telepathy-glib/handle-repo-internal.h                     | 3 +++
 telepathy-glib/handle-repo.h                              | 2 --
 telepathy-glib/handle-set.c                               | 8 +++++---
 telepathy-glib/versions/main-1.0.abi                      | 1 -
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 9c6dc3a..5ed483a 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -219,7 +219,6 @@ tp_handle_set_is_member
 tp_handle_set_foreach
 tp_handle_set_is_empty
 tp_handle_set_size
-tp_handle_set_to_array
 tp_handle_set_to_variant
 tp_handle_set_to_identifier_map
 tp_handle_set_update
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index b81274d..809701d 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -3694,7 +3694,7 @@ tp_base_contact_list_mixin_get_contact_list_attributes (
       GVariant *result;
 
       set = tp_base_contact_list_dup_contacts (self);
-      contacts = tp_handle_set_to_array (set);
+      contacts = _tp_handle_set_to_array (set);
       result = tp_base_connection_dup_contact_attributes (
           self->priv->conn, contacts, interfaces, assumed);
 
diff --git a/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c
index a0f514f..0735cbe 100644
--- a/telepathy-glib/group-mixin.c
+++ b/telepathy-glib/group-mixin.c
@@ -74,6 +74,8 @@
 #include <telepathy-glib/sliced-gvalue.h>
 #include <telepathy-glib/svc-channel.h>
 
+#include "handle-repo-internal.h"
+
 #define DEBUG_FLAG TP_DEBUG_GROUPS
 
 #include "debug-internal.h"
@@ -736,7 +738,7 @@ tp_group_mixin_get_members (GObject *obj,
 {
   TpGroupMixin *mixin = TP_GROUP_MIXIN (obj);
 
-  *ret = tp_handle_set_to_array (mixin->members);
+  *ret = _tp_handle_set_to_array (mixin->members);
 
   return TRUE;
 }
@@ -822,7 +824,7 @@ tp_group_mixin_get_remote_pending_members (GObject *obj,
 {
   TpGroupMixin *mixin = TP_GROUP_MIXIN (obj);
 
-  *ret = tp_handle_set_to_array (mixin->remote_pending);
+  *ret = _tp_handle_set_to_array (mixin->remote_pending);
 
   return TRUE;
 }
diff --git a/telepathy-glib/handle-repo-internal.h b/telepathy-glib/handle-repo-internal.h
index 931a51c..5c77492 100644
--- a/telepathy-glib/handle-repo-internal.h
+++ b/telepathy-glib/handle-repo-internal.h
@@ -96,6 +96,9 @@ void _tp_dynamic_handle_repo_set_normalization_data (TpHandleRepoIface *irepo,
     gpointer data,
     GDestroyNotify destroy);
 
+GArray *_tp_handle_set_to_array (const TpHandleSet *set)
+  G_GNUC_WARN_UNUSED_RESULT;
+
 G_END_DECLS
 
 #endif /*__TP_INTERNAL_HANDLE_REPO_H__ */
diff --git a/telepathy-glib/handle-repo.h b/telepathy-glib/handle-repo.h
index 3e07143..2460237 100644
--- a/telepathy-glib/handle-repo.h
+++ b/telepathy-glib/handle-repo.h
@@ -140,8 +140,6 @@ void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func,
 
 gboolean tp_handle_set_is_empty (const TpHandleSet *set);
 int tp_handle_set_size (const TpHandleSet *set);
-GArray *tp_handle_set_to_array (const TpHandleSet *set)
-  G_GNUC_WARN_UNUSED_RESULT;
 GVariant *tp_handle_set_to_identifier_map (TpHandleSet *self)
     G_GNUC_WARN_UNUSED_RESULT;
 
diff --git a/telepathy-glib/handle-set.c b/telepathy-glib/handle-set.c
index 81b3234..1df217c 100644
--- a/telepathy-glib/handle-set.c
+++ b/telepathy-glib/handle-set.c
@@ -30,6 +30,8 @@
 #include <glib.h>
 
 #include <telepathy-glib/intset.h>
+#include "handle-repo-internal.h"
+
 #define DEBUG_FLAG TP_DEBUG_HANDLES
 #include "debug-internal.h"
 
@@ -253,8 +255,8 @@ tp_handle_set_size (const TpHandleSet *set)
   return tp_intset_size (set->intset);
 }
 
-/**
- * tp_handle_set_to_array: (skip)
+/*
+ * _tp_handle_set_to_array: (skip)
  * @set: A handle set
  *
  * <!--Returns: says it all, this comment is just to keep gtkdoc happy-->
@@ -263,7 +265,7 @@ tp_handle_set_size (const TpHandleSet *set)
  * representing the handles in the set
  */
 GArray *
-tp_handle_set_to_array (const TpHandleSet *set)
+_tp_handle_set_to_array (const TpHandleSet *set)
 {
   g_return_val_if_fail (set != NULL, NULL);
 
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index 22ae851..e552c94 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -884,7 +884,6 @@ tp_handle_set_new_from_intset
 tp_handle_set_peek
 tp_handle_set_remove
 tp_handle_set_size
-tp_handle_set_to_array
 tp_handle_set_to_identifier_map
 tp_handle_set_update
 tp_handles_are_valid
-- 
1.9.0