[Pkg-telepathy-commits] [telepathy-glib-1] 198/212: tp_base_connection_dup_contact_attributes: make it public again

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib-1.

commit 0691d675bb0effec0574cd99abec37964610eb29
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Apr 17 17:38:04 2014 +0100

    tp_base_connection_dup_contact_attributes: make it public again
    
    Gabble's Addressing implementation needs this functionality.
    
    Reviewed-by: Xavier Claessens <xavier.claessens at collabora.com>
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77189
---
 .../telepathy-glib/telepathy-glib-sections.txt          |  1 +
 telepathy-glib/base-connection-internal.h               |  6 ------
 telepathy-glib/base-connection.c                        | 17 ++++++++---------
 telepathy-glib/base-connection.h                        |  5 +++++
 telepathy-glib/base-contact-list.c                      |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 50f650c..4556dd0 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -41,6 +41,7 @@ tp_base_connection_check_connected
 tp_base_connection_change_status
 tp_base_connection_disconnect_with_dbus_error
 tp_base_connection_finish_shutdown
+tp_base_connection_dup_contact_attributes
 TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED
 tp_base_connection_add_possible_client_interest
 tp_base_connection_add_client_interest
diff --git a/telepathy-glib/base-connection-internal.h b/telepathy-glib/base-connection-internal.h
index 5fb3874..2062d2b 100644
--- a/telepathy-glib/base-connection-internal.h
+++ b/telepathy-glib/base-connection-internal.h
@@ -92,12 +92,6 @@ void _tp_base_connection_set_handle_repo (TpBaseConnection *self,
 gpointer _tp_base_connection_find_channel_manager (TpBaseConnection *self,
     GType type);
 
-GVariant *_tp_base_connection_dup_contact_attributes (
-    TpBaseConnection *self,
-    const GArray *handles,
-    const gchar * const *interfaces,
-    const gchar * const *assumed_interfaces);
-
 G_END_DECLS
 
 #endif
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 99ca29c..4fc1f13 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -2633,12 +2633,11 @@ static const gchar * const contacts_always_included_interfaces[] = {
     NULL
 };
 
-/*
- * tp_base_connection_dup_contact_attributes_hash: (skip)
- * @self: A connection instance that uses this mixin. The connection must
- *  be connected.
- * @handles: List of handles to retrieve contacts for. Any invalid handles
- *  will be dropped from the returned mapping.
+/**
+ * tp_base_connection_dup_contact_attributes:
+ * @self: A connection instance. The connection must be connected.
+ * @handles: (element-type guint32): List of handles to retrieve contacts for.
+ *  Any invalid handles will be dropped from the returned mapping.
  * @interfaces: (allow-none) (array zero-terminated=1) (element-type utf8): an
  *  array of user-requested interfaces
  * @assumed_interfaces: (allow-none) (array zero-terminated=1) (element-type utf8):
@@ -2656,7 +2655,7 @@ static const gchar * const contacts_always_included_interfaces[] = {
  * Returns: (transfer full): a #GVariant of type "a{ua{sv}}"
  */
 GVariant *
-_tp_base_connection_dup_contact_attributes (TpBaseConnection *self,
+tp_base_connection_dup_contact_attributes (TpBaseConnection *self,
     const GArray *handles,
     const gchar * const *interfaces,
     const gchar * const *assumed_interfaces)
@@ -2745,7 +2744,7 @@ contacts_get_contact_attributes_impl (_TpGDBusConnection *skeleton,
   array = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), n);
   g_array_append_vals (array, c_array, n);
 
-  result = _tp_base_connection_dup_contact_attributes (conn,
+  result = tp_base_connection_dup_contact_attributes (conn,
       array, interfaces, contacts_always_included_interfaces);
 
   _tp_gdbus_connection_complete_get_contact_attributes (skeleton, context,
@@ -2790,7 +2789,7 @@ ensure_handle_cb (GObject *source,
   handles = g_array_new (FALSE, FALSE, sizeof (TpHandle));
   g_array_append_val (handles, handle);
 
-  attributes = _tp_base_connection_dup_contact_attributes (self,
+  attributes = tp_base_connection_dup_contact_attributes (self,
       handles, (const gchar * const *) data->interfaces,
       contacts_always_included_interfaces);
   g_variant_get_child (attributes, 0, "{u at a{sv}}", &ret_handle, &ret);
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index da9aecd..1b9c722 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -204,6 +204,11 @@ _TP_AVAILABLE_IN_0_24
 const gchar *tp_base_connection_get_account_path_suffix (
     TpBaseConnection *self);
 
+GVariant *tp_base_connection_dup_contact_attributes (TpBaseConnection *self,
+    const GArray *handles,
+    const gchar * const *interfaces,
+    const gchar * const *assumed_interfaces);
+
 G_END_DECLS
 
 #endif /* #ifndef __TP_BASE_CONNECTION_H__*/
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index 79bd6b9..6ab8663 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -3692,7 +3692,7 @@ tp_base_contact_list_mixin_get_contact_list_attributes (
 
       set = tp_base_contact_list_dup_contacts (self);
       contacts = tp_handle_set_to_array (set);
-      result = _tp_base_connection_dup_contact_attributes (
+      result = tp_base_connection_dup_contact_attributes (
           self->priv->conn, contacts, interfaces, assumed);
 
       _tp_gdbus_connection_interface_contact_list1_complete_get_contact_list_attributes (

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git