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

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

5 files changed, 13 insertions, 7 deletions

diff --git a/salut/caps-channel-manager.h b/salut/caps-channel-manager.h
index e5623bbf..4e0d561d 100644
--- a/salut/caps-channel-manager.h
+++ b/salut/caps-channel-manager.h
@@ -71,7 +71,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);
@@ -87,7 +88,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 _GabbleCapsChannelManagerIface {
     GTypeInterface parent;
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index cc9a8be2..c01bfd9e 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -114,7 +114,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)
 {
   GabbleCapsChannelManagerIface *iface =
     GABBLE_CAPS_CHANNEL_MANAGER_GET_INTERFACE (caps_manager);
@@ -122,6 +123,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/salut-connection.c b/src/salut-connection.c
index 7005e188..f3444dce 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -2129,9 +2129,10 @@ salut_connection_update_capabilities (
           /* all channel managers must implement the capability interface */
           g_assert (GABBLE_IS_CAPS_CHANNEL_MANAGER (manager));
 
+          /* TODO: data form pointer array */
           gabble_caps_channel_manager_represent_client (
               GABBLE_CAPS_CHANNEL_MANAGER (manager), client_name, filters,
-              cap_tokens, after);
+              cap_tokens, after, NULL);
         }
     }
 
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index 3df7a42b..8cade2df 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -599,7 +599,8 @@ salut_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)
 {
   guint i;
 
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index a6039e78..17f02e5f 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -1257,7 +1257,8 @@ salut_tubes_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)
 {
   guint i;