}
EmpathyTubeHandler *
-empathy_tube_handler_new (EmpathyTubeType type, const gchar *service)
+empathy_tube_handler_new (TpTubeType type, const gchar *service)
{
EmpathyTubeHandler *thandler = NULL;
DBusGProxy *proxy;
gchar *object_path;
GError *error = NULL;
- g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL);
+ g_return_val_if_fail (type < NUM_TP_TUBE_TYPES, NULL);
g_return_val_if_fail (service != NULL, NULL);
bus_name = empathy_tube_handler_build_bus_name (type, service);
goto OUT;
}
+ DEBUG ("Creating tube handler %s", bus_name);
thandler = g_object_new (EMPATHY_TYPE_TUBE_HANDLER, NULL);
dbus_g_connection_register_g_object (tp_get_bus (), object_path,
G_OBJECT (thandler));
return thandler;
}
+static gchar *
+sanitize_service_name (const gchar *str)
+{
+ guint i;
+ gchar *result;
+
+ g_assert (str != NULL);
+ result = g_strdup (str);
+
+ for (i = 0; result[i] != '\0'; i++)
+ {
+ if (!g_ascii_isalnum (result[i]))
+ result[i] = '_';
+ }
+
+ return result;
+}
+
gchar *
-empathy_tube_handler_build_bus_name (EmpathyTubeType type,
+empathy_tube_handler_build_bus_name (TpTubeType type,
const gchar *service)
{
gchar *str = NULL;
const gchar *prefix = NULL;
+ gchar *service_escaped;
- g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL);
+ g_return_val_if_fail (type < NUM_TP_TUBE_TYPES, NULL);
g_return_val_if_fail (service != NULL, NULL);
- if (type == EMPATHY_TYPE_DBUS_TUBE)
+ if (type == TP_TUBE_TYPE_DBUS)
prefix = "org.gnome.Empathy.DTubeHandler.";
- else if (type == EMPATHY_TYPE_STREAM_TUBE)
+ else if (type == TP_TUBE_TYPE_STREAM)
prefix = "org.gnome.Empathy.StreamTubeHandler.";
else
g_return_val_if_reached (NULL);
- str = g_strconcat (prefix, service, NULL);
+ service_escaped = sanitize_service_name (service);
+ str = g_strconcat (prefix, service_escaped, NULL);
+ g_free (service_escaped);
return str;
}
gchar *
-empathy_tube_handler_build_object_path (EmpathyTubeType type,
+empathy_tube_handler_build_object_path (TpTubeType type,
const gchar *service)
{
gchar *bus_name;
gchar *str;
- g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL);
+ g_return_val_if_fail (type < NUM_TP_TUBE_TYPES, NULL);
g_return_val_if_fail (service != NULL, NULL);
bus_name = empathy_tube_handler_build_bus_name (type, service);