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

[Robert McQueen]

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.
---
 src/private-tubes-factory.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 17a24d1..d3c3045 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -582,19 +582,19 @@ gabble_private_tubes_factory_parse_caps (
 
       if (g_str_has_prefix (var, NS_TUBES "/"))
         {
-          /* http://telepathy.freedesktop.org/xmpp/tubes/$type/$service */
+          /* http://telepathy.freedesktop.org/xmpp/tubes/$type#$service */
           var += strlen (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);
             }
@@ -785,7 +785,7 @@ gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
       gchar *service = g_strdup (tp_asv_get_string (cap,
           GABBLE_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"));
       feat->feature_type = FEATURE_OPTIONAL;
-      feat->ns = g_strdup_printf ("%s/stream/%s", NS_TUBES, service);
+      feat->ns = g_strdup_printf ("%s/stream#%s", NS_TUBES, service);
       feat->caps = 0;
       g_hash_table_insert (caps->stream_tube_caps, service, feat);
     }
@@ -795,7 +795,7 @@ gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
       gchar *service = g_strdup (tp_asv_get_string (cap,
           GABBLE_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName"));
       feat->feature_type = FEATURE_OPTIONAL;
-      feat->ns = g_strdup_printf ("%s/dbus/%s", NS_TUBES, service);
+      feat->ns = g_strdup_printf ("%s/dbus#%s", NS_TUBES, service);
       feat->caps = 0;
       g_hash_table_insert (caps->dbus_tube_caps, service, feat);
     }
-- 
1.5.6.5