[telepathy-gabble/master] gabble_capabilities_get_initial_caps: rename to gabble_capabilities_get_fixed_caps

[Simon McVittie]

Our initial caps are actually these plus a couple of bonus ones (Jingle
transports).
---
 src/capabilities.c |   14 +++++++-------
 src/capabilities.h |    2 +-
 src/connection.c   |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 58d14d6..1070b92 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -97,7 +97,7 @@ static GabbleCapabilitySet *video_v1_caps = NULL;
 static GabbleCapabilitySet *any_audio_caps = NULL;
 static GabbleCapabilitySet *any_video_caps = NULL;
 static GabbleCapabilitySet *any_transport_caps = NULL;
-static GabbleCapabilitySet *initial_caps = NULL;
+static GabbleCapabilitySet *fixed_caps = NULL;
 static GabbleCapabilitySet *geoloc_caps = NULL;
 static GabbleCapabilitySet *olpc_caps = NULL;
 
@@ -138,9 +138,9 @@ gabble_capabilities_get_any_transport (void)
 }
 
 const GabbleCapabilitySet *
-gabble_capabilities_get_initial_caps (void)
+gabble_capabilities_get_fixed_caps (void)
 {
-  return initial_caps;
+  return fixed_caps;
 }
 
 const GabbleCapabilitySet *
@@ -241,12 +241,12 @@ gabble_capabilities_init (GabbleConnection *conn)
       gabble_capability_set_add (any_transport_caps, NS_JINGLE_TRANSPORT_ICEUDP);
       gabble_capability_set_add (any_transport_caps, NS_JINGLE_TRANSPORT_RAWUDP);
 
-      initial_caps = gabble_capability_set_new ();
+      fixed_caps = gabble_capability_set_new ();
 
       for (feat = self_advertised_features; feat->ns != NULL; feat++)
         {
           if (feat->feature_type == FEATURE_FIXED)
-            gabble_capability_set_add (initial_caps, feat->ns);
+            gabble_capability_set_add (fixed_caps, feat->ns);
         }
 
       geoloc_caps = gabble_capability_set_new ();
@@ -279,7 +279,7 @@ gabble_capabilities_finalize (GabbleConnection *conn)
       gabble_capability_set_free (any_audio_caps);
       gabble_capability_set_free (any_video_caps);
       gabble_capability_set_free (any_transport_caps);
-      gabble_capability_set_free (initial_caps);
+      gabble_capability_set_free (fixed_caps);
       gabble_capability_set_free (geoloc_caps);
       gabble_capability_set_free (olpc_caps);
 
@@ -289,7 +289,7 @@ gabble_capabilities_finalize (GabbleConnection *conn)
       any_audio_caps = NULL;
       any_video_caps = NULL;
       any_transport_caps = NULL;
-      initial_caps = NULL;
+      fixed_caps = NULL;
       geoloc_caps = NULL;
       olpc_caps = NULL;
 
diff --git a/src/capabilities.h b/src/capabilities.h
index d8f657d..d5712c9 100644
--- a/src/capabilities.h
+++ b/src/capabilities.h
@@ -117,7 +117,7 @@ const GabbleCapabilitySet *gabble_capabilities_get_bundle_video_v1 (void);
 void capabilities_fill_cache (GabblePresenceCache *cache);
 
 /* Return the capabilities we always have */
-const GabbleCapabilitySet *gabble_capabilities_get_initial_caps (void);
+const GabbleCapabilitySet *gabble_capabilities_get_fixed_caps (void);
 
 typedef void (*TypeFlagsToCapsFunc) (guint typeflags, GabbleCapabilitySet *caps);
 typedef guint (*CapsToTypeFlagsFunc) (const GabbleCapabilitySet *caps);
diff --git a/src/connection.c b/src/connection.c
index 8fd4d81..d73dc7e 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1597,7 +1597,7 @@ gabble_connection_refresh_capabilities (GabbleConnection *self)
   gabble_capability_set_clear (self->priv->all_caps);
 
   gabble_capability_set_update (self->priv->all_caps,
-      gabble_capabilities_get_initial_caps ());
+      gabble_capabilities_get_fixed_caps ());
   gabble_capability_set_update (self->priv->all_caps, self->priv->notify_caps);
   gabble_capability_set_update (self->priv->all_caps, self->priv->legacy_caps);
   gabble_capability_set_update (self->priv->all_caps, self->priv->draft1_caps);
-- 
1.5.6.5