Uplift test resolver to glib-2,59.0

1 files changed, 33 insertions, 6 deletions

diff --git a/tests/test-resolver.c b/tests/test-resolver.c
index 74c7a1a..9e7ae89 100644
--- a/tests/test-resolver.c
+++ b/tests/test-resolver.c
@@ -203,11 +203,12 @@ lookup_service_finish (GResolver *resolver,
 }
 
 static void
-lookup_by_name_async (GResolver *resolver,
-                      const gchar *hostname,
-                      GCancellable *cancellable,
-                      GAsyncReadyCallback  cb,
-                      gpointer data)
+lookup_by_name_with_flags_async (GResolver                *resolver,
+                                 const gchar              *hostname,
+                                 GResolverNameLookupFlags  flags,
+                                 GCancellable             *cancellable,
+                                 GAsyncReadyCallback       cb,
+                                 gpointer                  data)
 {
   TestResolver *tr = TEST_RESOLVER (resolver);
   GList *addr = find_fake_hosts (tr, hostname);
@@ -226,7 +227,8 @@ lookup_by_name_async (GResolver *resolver,
             inet_ntop (AF_INET,
               g_inet_address_to_bytes (x->data), a, sizeof (a)));
 #endif
-      res = g_simple_async_result_new (source, cb, data, lookup_by_name_async);
+      res = g_simple_async_result_new (source, cb, data,
+                                       lookup_by_name_with_flags_async);
     }
   else
     {
@@ -241,6 +243,18 @@ lookup_by_name_async (GResolver *resolver,
   g_object_unref (res);
 }
 
+static void
+lookup_by_name_async (GResolver *resolver,
+                      const gchar *hostname,
+                      GCancellable *cancellable,
+                      GAsyncReadyCallback  cb,
+                      gpointer data)
+{
+  lookup_by_name_with_flags_async (resolver, hostname,
+                                   G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT,
+                                   cancellable, cb, data);
+}
+
 static GList *
 lookup_by_name_finish (GResolver *resolver,
     GAsyncResult *result,
@@ -256,6 +270,15 @@ lookup_by_name_finish (GResolver *resolver,
   return object_list_copy (res);
 }
 
+#if GLIB_VERSION_CUR_STABLE >= (G_ENCODE_VERSION (2, 60))
+static GList *
+lookup_by_name_with_flags_finish (GResolver *resolver,
+    GAsyncResult *result,
+    GError **error)
+{
+  return lookup_by_name_finish (resolver, result, error);
+}
+#endif
 
 /* ************************************************************************* */
 
@@ -323,6 +346,10 @@ test_resolver_class_init (TestResolverClass *klass)
   resolver_class->lookup_by_name_finish    = lookup_by_name_finish;
   resolver_class->lookup_service_async     = lookup_service_async;
   resolver_class->lookup_service_finish    = lookup_service_finish;
+#if GLIB_VERSION_CUR_STABLE >= (G_ENCODE_VERSION (2, 60))
+  resolver_class->lookup_by_name_with_flags_async  = lookup_by_name_with_flags_async;
+  resolver_class->lookup_by_name_with_flags_finish = lookup_by_name_with_flags_finish;
+#endif
 }
 
 void