[telepathy-gabble/master] GabbleCapsChannelManager: remove add_cap method in favour of represent_client

[Simon McVittie]

Also remove useless ABI padding - this isn't a library.
---
 src/caps-channel-manager.c  |   26 --------------------------
 src/caps-channel-manager.h  |    7 -------
 src/private-tubes-factory.c |    6 +++---
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index 545bee1..7ec98b5 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -79,32 +79,6 @@ gabble_caps_channel_manager_get_contact_capabilities (
 }
 
 /**
- * gabble_caps_channel_manager_add_capability:
- * @cap: the Telepathy-level capability to add
- * @cap_set: a set of XMPP namespaces, to which the namespaces corresponding to
- *           @cap should be added
- *
- * Used to advertise that we support the XMPP capabilities corresponding to the
- * Telepathy capability supplied.
- */
-void
-gabble_caps_channel_manager_add_capability (
-    GabbleCapsChannelManager *caps_manager,
-    GHashTable *cap,
-    GabbleCapabilitySet *cap_set)
-{
-  GabbleCapsChannelManagerIface *iface =
-    GABBLE_CAPS_CHANNEL_MANAGER_GET_INTERFACE (caps_manager);
-  GabbleCapsChannelManagerAddCapFunc method = iface->add_cap;
-
-  if (method != NULL)
-    {
-      method (caps_manager, cap, cap_set);
-    }
-  /* ... else, nothing to do */
-}
-
-/**
  * gabble_caps_channel_manager_represent_client:
  * @self: a channel manager
  * @client_name: the name of the client, for any debug messages
diff --git a/src/caps-channel-manager.h b/src/caps-channel-manager.h
index b4e5733..8ebcd87 100644
--- a/src/caps-channel-manager.h
+++ b/src/caps-channel-manager.h
@@ -78,11 +78,6 @@ void gabble_caps_channel_manager_get_contact_capabilities (
     const GabbleCapabilitySet *caps,
     GPtrArray *arr);
 
-void gabble_caps_channel_manager_add_capability (
-    GabbleCapsChannelManager *caps_manager,
-    GHashTable *cap,
-    GabbleCapabilitySet *cap_set);
-
 void gabble_caps_channel_manager_represent_client (
     GabbleCapsChannelManager *caps_manager,
     const gchar *client_name,
@@ -94,10 +89,8 @@ struct _GabbleCapsChannelManagerIface {
     GTypeInterface parent;
 
     GabbleCapsChannelManagerGetContactCapsFunc get_contact_caps;
-    GabbleCapsChannelManagerAddCapFunc add_cap;
     GabbleCapsChannelManagerRepresentClientFunc represent_client;
 
-    GCallback _future[8];
     gpointer priv;
 };
 
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index f4e284f..b5e080b 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -563,6 +563,7 @@ gabble_private_tubes_factory_get_contact_caps (
 
 static void
 gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
+    const gchar *client_name,
     GHashTable *cap,
     GabbleCapabilitySet *cap_set)
 {
@@ -601,7 +602,7 @@ gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
 
   if (ns != NULL)
     {
-      DEBUG ("adding capability %s", ns);
+      DEBUG ("%s: adding capability %s", client_name, ns);
       gabble_capability_set_add (cap_set, ns);
       g_free (ns);
     }
@@ -619,7 +620,7 @@ gabble_private_tubes_factory_represent_client (
 
   for (i = 0; i < filters->len; i++)
     {
-      gabble_private_tubes_factory_add_cap (manager,
+      gabble_private_tubes_factory_add_cap (manager, client_name,
           g_ptr_array_index (filters, i), cap_set);
     }
 }
@@ -1096,6 +1097,5 @@ caps_channel_manager_iface_init (gpointer g_iface,
   GabbleCapsChannelManagerIface *iface = g_iface;
 
   iface->get_contact_caps = gabble_private_tubes_factory_get_contact_caps;
-  iface->add_cap = gabble_private_tubes_factory_add_cap;
   iface->represent_client = gabble_private_tubes_factory_represent_client;
 }
-- 
1.5.6.5