aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordequis <dx@dxzone.com.ar>2014-09-27 11:54:35 -0300
committerdequis <dx@dxzone.com.ar>2014-09-27 11:54:35 -0300
commit286cd480d844475d545ca90e422e4a0f72f851ca (patch)
tree10617f9e98a4cc11e375b6c189805a7bd335c731 /lib
parent0c5727785675d07493dcbd86593ad2049cf4e3a6 (diff)
Prevent some "Source ID ## was not found..." warnings
These appear in glib 2.40, and, well, are pretty much useless. But people complain about them anyway. Probably fixes trac ticket 1151, at least partially.
Diffstat (limited to 'lib')
-rw-r--r--lib/http_client.c3
-rw-r--r--lib/ssl_gnutls.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/http_client.c b/lib/http_client.c
index b509c839..18c393f8 100644
--- a/lib/http_client.c
+++ b/lib/http_client.c
@@ -291,6 +291,9 @@ eof:
}
cleanup:
+ /* Avoid g_source_remove warnings */
+ req->inpa = 0;
+
if( req->ssl )
ssl_disconnect( req->ssl );
else
diff --git a/lib/ssl_gnutls.c b/lib/ssl_gnutls.c
index 9965fbf7..f6bdd6b2 100644
--- a/lib/ssl_gnutls.c
+++ b/lib/ssl_gnutls.c
@@ -334,6 +334,9 @@ static gboolean ssl_handshake( gpointer data, gint source, b_input_condition con
struct scd *conn = data;
int st, stver;
+ /* This function returns false, so avoid calling b_event_remove again */
+ conn->inpa = -1;
+
if( ( st = gnutls_handshake( conn->session ) ) < 0 )
{
if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )