[telepathy-gabble/master] Remove the distinction between FEATURE_OPTIONAL and FEATURE_BUNDLE_COMPAT

[Simon McVittie]

---
 src/capabilities.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 166d77d..df4c794 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -44,8 +44,7 @@ struct _Feature
 {
   enum {
     FEATURE_FIXED,
-    FEATURE_OPTIONAL,
-    FEATURE_BUNDLE_COMPAT   /* just for voice-v1/video-v1 */
+    FEATURE_OPTIONAL
   } feature_type;
   gchar *ns;
 };
@@ -67,7 +66,7 @@ static const Feature self_advertised_features[] =
   { FEATURE_FIXED, NS_BYTESTREAMS },
   { FEATURE_FIXED, NS_FILE_TRANSFER },
 
-  { FEATURE_BUNDLE_COMPAT, NS_GOOGLE_FEAT_VOICE },
+  { FEATURE_OPTIONAL, NS_GOOGLE_FEAT_VOICE },
   { FEATURE_OPTIONAL, NS_GOOGLE_FEAT_VIDEO },
   { FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_AUDIO },
   { FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_VIDEO },
-- 
1.5.6.5