summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-02-18 17:46:03 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-02-23 22:09:52 -0500
commitd6fb9ed6c592a76efdedae9197d86321b6fcecfa (patch)
treecc9bb4de40ea6e34f596bab7eaa211f525a34b2a
parent95d500aa3e4000f963419fd776592e829e7805a2 (diff)
Ignore empty strings in tp properties (treat them as NULL)
-rw-r--r--telepathy-farsight/channel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/telepathy-farsight/channel.c b/telepathy-farsight/channel.c
index 80f589c..2eb4b5a 100644
--- a/telepathy-farsight/channel.c
+++ b/telepathy-farsight/channel.c
@@ -177,7 +177,7 @@ cb_properties_changed (TpProxy *proxy G_GNUC_UNUSED,
g_free (self->priv->nat_props.nat_traversal);
self->priv->nat_props.nat_traversal = NULL;
- if (G_VALUE_HOLDS_STRING (value))
+ if (G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)[0])
self->priv->nat_props.nat_traversal = g_value_dup_string (value);
}
else if (id == self->priv->prop_id_stun_server)
@@ -185,7 +185,7 @@ cb_properties_changed (TpProxy *proxy G_GNUC_UNUSED,
g_free (self->priv->nat_props.stun_server);
self->priv->nat_props.stun_server = NULL;
- if (G_VALUE_HOLDS_STRING (value))
+ if (G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)[0])
self->priv->nat_props.stun_server = g_value_dup_string (value);
}
else if (id == self->priv->prop_id_gtalk_p2p_relay_token)
@@ -193,7 +193,7 @@ cb_properties_changed (TpProxy *proxy G_GNUC_UNUSED,
g_free (self->priv->nat_props.relay_token);
self->priv->nat_props.relay_token = NULL;
- if (G_VALUE_HOLDS_STRING (value))
+ if (G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)[0])
self->priv->nat_props.relay_token = g_value_dup_string (value);
}
else if (id == self->priv->prop_id_stun_port)