[glib-networking] proxy: two fixes to the previous libproxy commit



commit d80e2c548e05ae4a1a1c219a21e56de32aa725d5
Author: Dan Winship <danw gnome org>
Date:   Mon May 13 17:05:35 2013 -0400

    proxy: two fixes to the previous libproxy commit

 proxy/libproxy/glibproxyresolver.c |    2 +-
 proxy/tests/Makefile.am            |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/proxy/libproxy/glibproxyresolver.c b/proxy/libproxy/glibproxyresolver.c
index 489a176..5daee5d 100644
--- a/proxy/libproxy/glibproxyresolver.c
+++ b/proxy/libproxy/glibproxyresolver.c
@@ -173,7 +173,7 @@ g_libproxy_resolver_lookup (GProxyResolver  *iresolver,
   g_task_set_task_data (task, g_strdup (uri), g_free);
   g_task_set_return_on_cancel (task, TRUE);
 
-  g_task_run_in_thread (task, get_libproxy_proxies);
+  g_task_run_in_thread_sync (task, get_libproxy_proxies);
   proxies = g_task_propagate_pointer (task, error);
   g_object_unref (task);
 
diff --git a/proxy/tests/Makefile.am b/proxy/tests/Makefile.am
index 42e0716..ad5dd3c 100644
--- a/proxy/tests/Makefile.am
+++ b/proxy/tests/Makefile.am
@@ -18,3 +18,5 @@ endif
 if HAVE_LIBPROXY
 TEST_PROGS += libproxy
 endif
+
+EXTRA_DIST = common.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]