[libsoup/wip/tintou/proxy-resolver] SoupProxyResolver: add this deprecated class to the introspection

[Corentin Noël <corentinnoel src gnome org>]

commit 40a8d546f2097267adc6dd00041f83de7424a4dc
Author: Corentin Noël <corentin elementary io>
Date:   Thu Mar 29 23:45:49 2018 +0100

    SoupProxyResolver: add this deprecated class to the introspection

 libsoup/Makefile.am           |    2 +-
 libsoup/Soup-2.4-custom.vala  |    9 ---------
 libsoup/soup-proxy-resolver.c |   31 +++++++++++++++++++++++++++++++
 libsoup/soup-proxy-resolver.h |   12 ++++++------
 4 files changed, 38 insertions(+), 16 deletions(-)
---
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 4232be6..640be7a 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -272,7 +272,7 @@ SOUP_UNSTABLE_REQUEST_CFLAG = -DLIBSOUP_USE_UNSTABLE_REQUEST_API
 
 # Core library
 gi_soup_files = \
-       $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+       $(filter-out soup.h soup-enum-types.%,\
           $(soup_headers) $(filter-out %.h, $(libsoup_2_4_la_SOURCES)))
 gi_built_soup_files = soup-enum-types.h soup-version.h
 
diff --git a/libsoup/Soup-2.4-custom.vala b/libsoup/Soup-2.4-custom.vala
index 95c2ad9..0132a5f 100644
--- a/libsoup/Soup-2.4-custom.vala
+++ b/libsoup/Soup-2.4-custom.vala
@@ -16,13 +16,6 @@ namespace Soup {
                public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length);
        }
 
-       [Version (replacement = "Soup.ProxyURIResolver")]
-       [CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyResolverInterface", type_id = 
"soup_proxy_resolver_get_type ()")]
-       public interface ProxyResolver : Soup.SessionFeature, GLib.Object {
-               public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, 
GLib.Cancellable? cancellable, Soup.ProxyResolverCallback callback);
-               public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable? cancellable, out 
unowned Soup.Address addr);
-       }
-
        public errordomain SSLError {
                HANDSHAKE_NEEDS_READ,
                HANDSHAKE_NEEDS_WRITE,
@@ -163,6 +156,4 @@ namespace Soup {
                INSUFFICIENT_STORAGE,
                NOT_EXTENDED
        }
-
-       public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, 
Soup.Address p4);
 }
diff --git a/libsoup/soup-proxy-resolver.c b/libsoup/soup-proxy-resolver.c
index 8886c68..7899de5 100644
--- a/libsoup/soup-proxy-resolver.c
+++ b/libsoup/soup-proxy-resolver.c
@@ -21,6 +21,28 @@ soup_proxy_resolver_default_init (SoupProxyResolverInterface *iface)
 {
 }
 
+/**
+ * SoupProxyResolverCallback:
+ * @proxy_resolver:
+ * @msg:
+ * @arg:
+ * @addr:
+ * @user_data:
+ *
+ * Deprecated: 2.28: Use SoupProxyURIResolver instead
+ **/
+
+/**
+ * soup_proxy_resolver_get_proxy_async: (virtual get_proxy_async)
+ * @proxy_resolver:
+ * @msg:
+ * @async_context:
+ * @cancellable:
+ * @callback: (scope async)
+ * @user_data:
+ *
+ * Deprecated: 2.28: Use SoupProxyURIResolver.get_proxy_uri_async instead
+ **/
 void
 soup_proxy_resolver_get_proxy_async (SoupProxyResolver  *proxy_resolver,
                                     SoupMessage        *msg,
@@ -41,6 +63,15 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 #endif
 }
 
+/**
+ * soup_proxy_resolver_get_proxy_sync: (virtual get_proxy_sync)
+ * @proxy_resolver:
+ * @msg:
+ * @cancellable:
+ * @addr: (out) (transfer none):
+ *
+ * Deprecated: 2.28: Use SoupProxyURIResolver.get_proxy_uri_sync() instead
+ **/
 guint
 soup_proxy_resolver_get_proxy_sync (SoupProxyResolver  *proxy_resolver,
                                    SoupMessage        *msg,
diff --git a/libsoup/soup-proxy-resolver.h b/libsoup/soup-proxy-resolver.h
index 755d219..e2662f1 100644
--- a/libsoup/soup-proxy-resolver.h
+++ b/libsoup/soup-proxy-resolver.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_PROXY_RESOLVER_H
-#define SOUP_PROXY_RESOLVER_H 1
+#ifndef __SOUP_PROXY_RESOLVER_H__
+#define __SOUP_PROXY_RESOLVER_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -21,8 +21,8 @@ G_BEGIN_DECLS
 
 typedef struct _SoupProxyResolver SoupProxyResolver;
 
-typedef void (*SoupProxyResolverCallback) (SoupProxyResolver *, SoupMessage *,
-                                          guint, SoupAddress *, gpointer);
+typedef void (*SoupProxyResolverCallback) (SoupProxyResolver *proxy_resolver, SoupMessage *msg,
+                                          guint arg, SoupAddress *addr, gpointer user_data);
 
 typedef struct {
        GTypeInterface base;
@@ -31,7 +31,7 @@ typedef struct {
        void (*get_proxy_async) (SoupProxyResolver *proxy_resolver,
                                 SoupMessage *msg, GMainContext *async_context,
                                 GCancellable *cancellable,
-                                SoupProxyResolverCallback callaback,
+                                SoupProxyResolverCallback callback,
                                 gpointer user_data);
        guint (*get_proxy_sync) (SoupProxyResolver *proxy_resolver,
                                 SoupMessage *msg, GCancellable *cancellable,
@@ -62,4 +62,4 @@ guint soup_proxy_resolver_get_proxy_sync  (SoupProxyResolver  *proxy_resolver,
 
 G_END_DECLS
 
-#endif /*SOUP_PROXY_RESOLVER_H*/
+#endif /* __SOUP_PROXY_RESOLVER_H__ */