diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2014-10-27 08:05:44 +0000 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2014-10-27 08:05:44 +0000 |
commit | d2b3f253732b38a4a8e6bb8ffc40f7690009b0fd (patch) | |
tree | 36c9789da9e8fee7123c02cc0b3a3cd761175788 /protocols | |
parent | fef97af02332d5e7fd099dda8677870c75a406f2 (diff) | |
parent | b6bd99c766d88ef37c735f5bbd08e621288d955d (diff) |
Merging warning fixes from dx.
Diffstat (limited to 'protocols')
-rw-r--r-- | protocols/jabber/s5bytestream.c | 6 | ||||
-rw-r--r-- | protocols/jabber/si.c | 3 |
2 files changed, 9 insertions, 0 deletions
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 ); |