[Telepathy-commits] [telepathy-salut/master] Use # to concatenate service name to tubes caps URI

[Alban Crequy]

Tweak tubes features to be like:
 http://telepathy.freedesktop.org/xmpp/tubes/stream#rfb
Rather than:
 http://telepathy.freedesktop.org/xmpp/tubes/stream/rfb

So we can put something at the http:// URI that talks about the
protocol.

This commit is the same as in telepathy-gabble
361575641a3132467e320a4484fea698ae3b935b
---
 src/salut-tubes-manager.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 99a1bf5..09f2bdb 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -1258,19 +1258,19 @@ _parse_caps_item (GibberXmppNode *node, gpointer user_data)
 
   if (g_str_has_prefix (var, GIBBER_TELEPATHY_NS_TUBES "/"))
     {
-      /* http://telepathy.freedesktop.org/xmpp/tubes/$type/$service */
+      /* http://telepathy.freedesktop.org/xmpp/tubes/$type#$service */
       var += strlen (GIBBER_TELEPATHY_NS_TUBES "/");
-      if (g_str_has_prefix (var, "stream/"))
+      if (g_str_has_prefix (var, "stream#"))
         {
           gchar *service;
-          var += strlen ("stream/");
+          var += strlen ("stream#");
           service = g_strdup (var);
           g_hash_table_insert (caps->stream_tube_caps, service, NULL);
         }
-      else if (g_str_has_prefix (var, "dbus/"))
+      else if (g_str_has_prefix (var, "dbus#"))
         {
           gchar *service;
-          var += strlen ("dbus/");
+          var += strlen ("dbus#");
           service = g_strdup (var);
           g_hash_table_insert (caps->dbus_tube_caps, service, NULL);
         }
@@ -1493,7 +1493,7 @@ salut_private_tubes_factory_add_cap (SalutCapsChannelManager *manager,
       gchar *service = g_strdup (tp_asv_get_string (cap,
           SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"));
       feat->feature_type = FEATURE_OPTIONAL;
-      feat->ns = g_strdup_printf ("%s/stream/%s", GIBBER_TELEPATHY_NS_TUBES,
+      feat->ns = g_strdup_printf ("%s/stream#%s", GIBBER_TELEPATHY_NS_TUBES,
           service);
       g_hash_table_insert (caps->stream_tube_caps, service, feat);
     }
@@ -1503,7 +1503,7 @@ salut_private_tubes_factory_add_cap (SalutCapsChannelManager *manager,
       gchar *service = g_strdup (tp_asv_get_string (cap,
           SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName"));
       feat->feature_type = FEATURE_OPTIONAL;
-      feat->ns = g_strdup_printf ("%s/dbus/%s", GIBBER_TELEPATHY_NS_TUBES,
+      feat->ns = g_strdup_printf ("%s/dbus#%s", GIBBER_TELEPATHY_NS_TUBES,
           service);
       g_hash_table_insert (caps->dbus_tube_caps, service, feat);
     }
-- 
1.5.6.5