caps-channel-manager: add data form argument to represent_client

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

6 files changed, 15 insertions, 8 deletions

diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index bc3d2ea9..65005009 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -82,6 +82,7 @@ gabble_caps_channel_manager_get_contact_capabilities (
  *  GHashTable with string keys and GValue values
  * @cap_tokens: the handler capability tokens supported by the client
  * @cap_set: a set into which to merge additional XMPP capabilities
+ * @data_forms: a #GPtrArray of #WockyDataForm objects
  *
  * Convert the capabilities of a Telepathy client into XMPP capabilities to be
  * advertised.
@@ -95,7 +96,8 @@ gabble_caps_channel_manager_represent_client (
     const gchar *client_name,
     const GPtrArray *filters,
     const gchar * const *cap_tokens,
-    GabbleCapabilitySet *cap_set)
+    GabbleCapabilitySet *cap_set,
+    GPtrArray *data_forms)
 {
   GabbleCapsChannelManagerInterface *iface =
     GABBLE_CAPS_CHANNEL_MANAGER_GET_INTERFACE (caps_manager);
@@ -103,6 +105,6 @@ gabble_caps_channel_manager_represent_client (
 
   if (method != NULL)
     {
-      method (caps_manager, client_name, filters, cap_tokens, cap_set);
+      method (caps_manager, client_name, filters, cap_tokens, cap_set, data_forms);
     }
 }
diff --git a/src/caps-channel-manager.h b/src/caps-channel-manager.h
index 05947b75..9442476a 100644
--- a/src/caps-channel-manager.h
+++ b/src/caps-channel-manager.h
@@ -70,7 +70,8 @@ typedef void (*GabbleCapsChannelManagerRepresentClientFunc) (
     const gchar *client_name,
     const GPtrArray *filters,
     const gchar * const *cap_tokens,
-    GabbleCapabilitySet *cap_set);
+    GabbleCapabilitySet *cap_set,
+    GPtrArray *data_forms);
 
 void gabble_caps_channel_manager_reset_capabilities (
     GabbleCapsChannelManager *caps_manager);
@@ -86,7 +87,8 @@ void gabble_caps_channel_manager_represent_client (
     const gchar *client_name,
     const GPtrArray *filters,
     const gchar * const *cap_tokens,
-    GabbleCapabilitySet *cap_set);
+    GabbleCapabilitySet *cap_set,
+    GPtrArray *data_forms);
 
 struct _GabbleCapsChannelManagerInterface {
     GTypeInterface parent;
diff --git a/src/connection.c b/src/connection.c
index ad474d27..af1c3c13 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -3258,7 +3258,7 @@ gabble_connection_update_capabilities (
             {
               gabble_caps_channel_manager_represent_client (
                   GABBLE_CAPS_CHANNEL_MANAGER (manager), client_name, filters,
-                  cap_tokens, cap_set);
+                  cap_tokens, cap_set, NULL); /* TODO: dataforms */
             }
         }
 
diff --git a/src/ft-manager.c b/src/ft-manager.c
index 9c3128df..11006afc 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -824,7 +824,8 @@ gabble_ft_manager_represent_client (
     const gchar *client_name,
     const GPtrArray *filters,
     const gchar * const *cap_tokens G_GNUC_UNUSED,
-    GabbleCapabilitySet *cap_set)
+    GabbleCapabilitySet *cap_set,
+    GPtrArray *data_forms G_GNUC_UNUSED)
 {
   guint i;
 
diff --git a/src/media-factory.c b/src/media-factory.c
index 4a2c7c70..0c0b6c2d 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -1208,7 +1208,8 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
     const gchar *client_name,
     const GPtrArray *filters,
     const gchar * const *cap_tokens,
-    GabbleCapabilitySet *cap_set)
+    GabbleCapabilitySet *cap_set,
+    GPtrArray *data_forms)
 {
   static GQuark q_gtalk_p2p = 0, q_ice_udp = 0, q_h264 = 0;
   static GQuark qc_gtalk_p2p = 0, qc_ice_udp = 0, qc_h264 = 0;
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 4ec36fd1..b2b3200f 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -612,7 +612,8 @@ gabble_private_tubes_factory_represent_client (
     const gchar *client_name,
     const GPtrArray *filters,
     const gchar * const *cap_tokens,
-    GabbleCapabilitySet *cap_set)
+    GabbleCapabilitySet *cap_set,
+    GPtrArray *data_forms)
 {
   guint i;