diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-14 11:47:10 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-19 14:04:12 +0000 |
| commit | 4914050394b62b197e69f065962dafa8d27d8fcc (patch) | |
| tree | a1352f935942e3bdba1256f339ce5349de457d64 | |
| parent | 677b984c434b31483e1348069e1463d963b077e1 (diff) | |
jingle-content: reset idle ID in its callback
The callback returns FALSE so the source will be invalidated.
Recent GLib now raises a critical when attempting to remove an invalid ID,
making some jingle tests failing.
(cherry picked from commit 01fbaec365cc58d6f3de46ce3f54f6413f3ec0f9)
| -rw-r--r-- | wocky/wocky-jingle-content.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wocky/wocky-jingle-content.c b/wocky/wocky-jingle-content.c index 82eea32..1874fed 100644 --- a/wocky/wocky-jingle-content.c +++ b/wocky/wocky-jingle-content.c @@ -485,6 +485,8 @@ send_gtalk4_transport_accept (gpointer user_data) wocky_jingle_session_send (c->session, msg); + priv->gtalk4_event_id = 0; + return FALSE; } |