TpBaseConnection: Change fill_contact_attributes() to take a GVariantDict

1 files changed, 1 insertions, 22 deletions

diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index b3a8b9481..da9aecda6 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -40,8 +40,6 @@ G_BEGIN_DECLS
 typedef struct _TpBaseConnectionClass TpBaseConnectionClass;
 typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;
 
-typedef struct _TpContactAttributeMap TpContactAttributeMap;
-
 typedef void (*TpBaseConnectionProc) (TpBaseConnection *self);
 
 typedef gboolean (*TpBaseConnectionStartConnectingImpl) (
@@ -89,7 +87,7 @@ struct _TpBaseConnectionClass {
     void (*fill_contact_attributes) (TpBaseConnection *self,
         const gchar *dbus_interface,
         TpHandle contact,
-        TpContactAttributeMap *attributes);
+        GVariantDict *attributes);
 
     /*<private>*/
     GCallback _future[16];
@@ -202,25 +200,6 @@ void tp_base_connection_add_client_interest (TpBaseConnection *self,
 void tp_base_connection_add_possible_client_interest (TpBaseConnection *self,
     GQuark token);
 
-_TP_AVAILABLE_IN_1_0
-GHashTable *tp_base_connection_dup_contact_attributes_hash (
-    TpBaseConnection *self,
-    const GArray *handles,
-    const gchar * const *interfaces,
-    const gchar * const *assumed_interfaces);
-
-_TP_AVAILABLE_IN_1_0
-void tp_contact_attribute_map_set (TpContactAttributeMap *map,
-    TpHandle contact,
-    const gchar *token,
-    GVariant *value);
-
-_TP_AVAILABLE_IN_1_0
-void tp_contact_attribute_map_take_sliced_gvalue (TpContactAttributeMap *map,
-    TpHandle contact,
-    const gchar *token,
-    GValue *value);
-
 _TP_AVAILABLE_IN_0_24
 const gchar *tp_base_connection_get_account_path_suffix (
     TpBaseConnection *self);