empathy r2017 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r2017 - trunk/libempathy
- Date: Mon, 29 Dec 2008 09:11:46 +0000 (UTC)
Author: xclaesse
Date: Mon Dec 29 09:11:46 2008
New Revision: 2017
URL: http://svn.gnome.org/viewvc/empathy?rev=2017&view=rev
Log:
Correctly escape service name in dtube handlers
Signed-off-by: Will Thompson <will thompson collabora co uk>
Modified:
trunk/libempathy/empathy-tube-handler.c
Modified: trunk/libempathy/empathy-tube-handler.c
==============================================================================
--- trunk/libempathy/empathy-tube-handler.c (original)
+++ trunk/libempathy/empathy-tube-handler.c Mon Dec 29 09:11:46 2008
@@ -192,16 +192,20 @@
{
gchar *service_escaped;
gchar *str = NULL;
+ const gchar *prefix = NULL;
g_return_val_if_fail (type <= TP_TUBE_TYPE_STREAM, NULL);
g_return_val_if_fail (service != NULL, NULL);
- service_escaped = tp_escape_as_identifier (service);
if (type == TP_TUBE_TYPE_DBUS)
- str = g_strdup_printf ("org.gnome.Empathy.DTubeHandler.%s", service);
+ prefix = "org.gnome.Empathy.DTubeHandler.%s";
else if (type == TP_TUBE_TYPE_STREAM)
- str = g_strdup_printf ("org.gnome.Empathy.StreamTubeHandler.%s", service);
+ prefix = "org.gnome.Empathy.StreamTubeHandler.%s";
+ else
+ g_return_val_if_reached (NULL);
+ service_escaped = tp_escape_as_identifier (service);
+ str = g_strdup_printf (prefix, service_escaped);
g_free (service_escaped);
return str;
@@ -212,16 +216,20 @@
{
gchar *service_escaped;
gchar *str = NULL;
+ const gchar *prefix = NULL;
g_return_val_if_fail (type <= TP_TUBE_TYPE_STREAM, NULL);
g_return_val_if_fail (service != NULL, NULL);
- service_escaped = tp_escape_as_identifier (service);
if (type == TP_TUBE_TYPE_DBUS)
- str = g_strdup_printf ("/org/gnome/Empathy/DTubeHandler/%s", service);
+ prefix = "/org/gnome/Empathy/DTubeHandler/%s";
else if (type == TP_TUBE_TYPE_STREAM)
- str = g_strdup_printf ("/org/gnome/Empathy/StreamTubeHandler/%s", service);
+ prefix = "/org/gnome/Empathy/StreamTubeHandler/%s";
+ else
+ g_return_val_if_reached (NULL);
+ service_escaped = tp_escape_as_identifier (service);
+ str = g_strdup_printf (prefix, service_escaped);
g_free (service_escaped);
return str;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]