diff options
| author | Mike Ruprecht <cmaiku@gmail.com> | 2016-01-07 20:12:24 -0600 |
|---|---|---|
| committer | Mike Ruprecht <cmaiku@gmail.com> | 2016-01-07 20:12:24 -0600 |
| commit | 2b89bce33aa52320b17922eb849c6517656ce0a2 (patch) | |
| tree | 0c95566d66b88d282d88788d4a801c4a79b36ace /libpurple/proxy.c | |
| parent | f0f3c26ac648844f438f93bbb91a9448222c96ae (diff) | |
| download | pidgin-2b89bce33aa52320b17922eb849c6517656ce0a2.tar.gz | |
Use the GResolver which was passed to g_resolver_lookup_*_async()
Using the GResolver passed to the g_resolver_lookup_*_async() function
avoids the potential problem of the default resolver changing between
the *_async() and *_finish() functions.
Diffstat (limited to 'libpurple/proxy.c')
| -rw-r--r-- | libpurple/proxy.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libpurple/proxy.c b/libpurple/proxy.c index a6a12a7a90..7fb7088c7f 100644 --- a/libpurple/proxy.c +++ b/libpurple/proxy.c @@ -1309,7 +1309,6 @@ s4_canread(gpointer data, gint source, PurpleInputCondition cond) static void s4_host_resolved(GObject *source_object, GAsyncResult *res, gpointer data) { - GResolver *resolver = NULL; GInetAddress *address = NULL; GError *error = NULL; GList *hosts = NULL, *l = NULL; @@ -1322,10 +1321,8 @@ s4_host_resolved(GObject *source_object, GAsyncResult *res, gpointer data) connect_data->cancellable = NULL; } - resolver = g_resolver_get_default(); - - hosts = g_resolver_lookup_by_name_finish(resolver, res, &error); - g_object_unref(G_OBJECT(resolver)); + hosts = g_resolver_lookup_by_name_finish(G_RESOLVER(source_object), + res, &error); if (error->message != NULL) { purple_proxy_connect_data_disconnect(connect_data, error->message); @@ -2226,7 +2223,8 @@ connection_host_resolved(GObject *source, GAsyncResult *res, gpointer data) { GError *error = NULL; GList *addresses = NULL; - addresses = g_resolver_lookup_by_name_finish(g_resolver_get_default(), res, &error); + addresses = g_resolver_lookup_by_name_finish(G_RESOLVER(source), + res, &error); if(G_IS_CANCELLABLE(connect_data->cancellable)) { g_object_unref(G_OBJECT(connect_data->cancellable)); |