summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-05-07 14:16:31 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-05-07 14:16:31 (GMT)
commit83c68bdd127b67a9c53184c06187dd4ca5ddc89c (patch)
tree141c41861590e548db4fefc4bd93001ff2ca0b61
parentc5932733128be4bfb1d5b0ce9be5b136746266dc (diff)
parentf58bf0bb331a736b4a282452f70ca409de3fac7d (diff)
downloadwocky-83c68bdd127b67a9c53184c06187dd4ca5ddc89c.tar.gz
wocky-83c68bdd127b67a9c53184c06187dd4ca5ddc89c.tar.xz
Merge branch 'gabble-0.18'
-rw-r--r--wocky/wocky-jingle-info.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/wocky/wocky-jingle-info.c b/wocky/wocky-jingle-info.c
index 07b6d28..94b189e 100644
--- a/wocky/wocky-jingle-info.c
+++ b/wocky/wocky-jingle-info.c
@@ -274,7 +274,6 @@ stun_server_resolved_cb (GObject *resolver,
{
PendingStunServer *data = user_data;
WockyJingleInfo *self = data->factory;
- WockyJingleInfoPrivate *priv = self->priv;
GError *e = NULL;
WockyStunServer *stun_server;
gchar *address;
@@ -311,13 +310,13 @@ stun_server_resolved_cb (GObject *resolver,
if (data->source == WOCKY_STUN_SERVER_FALLBACK)
{
- wocky_stun_server_free (priv->fallback_stun_server);
- priv->fallback_stun_server = stun_server;
+ wocky_stun_server_free (self->priv->fallback_stun_server);
+ self->priv->fallback_stun_server = stun_server;
}
else
{
- wocky_stun_server_free (priv->stun_server);
- priv->stun_server = stun_server;
+ wocky_stun_server_free (self->priv->stun_server);
+ self->priv->stun_server = stun_server;
g_signal_emit (self, signals[STUN_SERVER_CHANGED], 0,
stun_server, data->stun_port);