fd.o#21151: Don't query SOCKS5 proxies when we are connected

We should query the SOCKS5 proxies only when we'll actually need them.
Export the query method so other components will be able to start the querying
process when needed.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 4336aa48c..728d2a414 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -297,8 +297,6 @@ disco_item_found_cb (GabbleDisco *disco,
   send_proxy_query (self, item->jid, FALSE);
 }
 
-static void query_socks5_proxies (GabbleBytestreamFactory *self);
-
 static gboolean
 socks5_proxies_timeout_cb (gpointer data)
 {
@@ -316,13 +314,14 @@ socks5_proxies_timeout_cb (gpointer data)
       return FALSE;
     }
 
-  query_socks5_proxies (self);
+  gabble_bytestream_factory_query_socks5_proxies (self);
 
   return FALSE;
 }
 
-static void
-query_socks5_proxies (GabbleBytestreamFactory *self)
+/* ask to the factory to try to find more proxies if needed */
+void
+gabble_bytestream_factory_query_socks5_proxies (GabbleBytestreamFactory *self)
 {
   GabbleBytestreamFactoryPrivate *priv = GABBLE_BYTESTREAM_FACTORY_GET_PRIVATE (
       self);
@@ -422,8 +421,6 @@ conn_status_changed_cb (GabbleConnection *conn,
       priv->socks5_potential_proxies = randomize_g_slist (
               priv->socks5_potential_proxies);
 
-      query_socks5_proxies (self);
-
       g_strfreev (jids);
     }
 }