From 8256ad5ed0c545dfbfd0035d0bac8296ac224467 Mon Sep 17 00:00:00 2001 From: dequis Date: Mon, 27 Oct 2014 03:36:05 -0300 Subject: Some more g_source_remove warning fixes - http_incoming_data calling itself - jabber_bs_free_transfer calling jabber_si_free_transfer --- protocols/jabber/s5bytestream.c | 6 ++++++ protocols/jabber/si.c | 3 +++ 2 files changed, 9 insertions(+) (limited to 'protocols') diff --git a/protocols/jabber/s5bytestream.c b/protocols/jabber/s5bytestream.c index f4618cef..6b22d95f 100644 --- a/protocols/jabber/s5bytestream.c +++ b/protocols/jabber/s5bytestream.c @@ -122,10 +122,16 @@ void jabber_bs_free_transfer( file_transfer_t *ft) { } if ( tf->watch_in ) + { b_event_remove( tf->watch_in ); + tf->watch_in = 0; + } if( tf->watch_out ) + { b_event_remove( tf->watch_out ); + tf->watch_out = 0; + } g_free( bt->pseudoadr ); diff --git a/protocols/jabber/si.c b/protocols/jabber/si.c index f5f3b2fe..f3060fff 100644 --- a/protocols/jabber/si.c +++ b/protocols/jabber/si.c @@ -34,7 +34,10 @@ void jabber_si_free_transfer( file_transfer_t *ft) struct jabber_data *jd = tf->ic->proto_data; if ( tf->watch_in ) + { b_event_remove( tf->watch_in ); + tf->watch_in = 0; + } jd->filetransfers = g_slist_remove( jd->filetransfers, tf ); -- cgit v1.2.3