[libsoup/wip/tintou/many-gir-fixes] Many fixes to the GObject Introspection
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/tintou/many-gir-fixes] Many fixes to the GObject Introspection
- Date: Thu, 29 Mar 2018 21:41:29 +0000 (UTC)
commit 4c08873c3e65e056c8e7cc963847967181d52286
Author: Corentin Noël <corentin elementary io>
Date: Thu Mar 29 22:40:41 2018 +0100
Many fixes to the GObject Introspection
libsoup/Makefile.am | 4 +-
libsoup/Soup-2.4-custom.vala | 162 ------------------------------
libsoup/Soup-2.4.metadata | 53 ++---------
libsoup/soup-address.h | 6 +-
libsoup/soup-auth-basic.h | 6 +-
libsoup/soup-auth-digest.h | 6 +-
libsoup/soup-auth-domain-basic.c | 14 ++-
libsoup/soup-auth-domain-basic.h | 6 +-
libsoup/soup-auth-domain-digest.c | 14 ++-
libsoup/soup-auth-domain-digest.h | 6 +-
libsoup/soup-auth-domain.c | 12 ++-
libsoup/soup-auth-domain.h | 6 +-
libsoup/soup-auth-manager.h | 6 +-
libsoup/soup-auth-negotiate.h | 6 +-
libsoup/soup-auth-ntlm.h | 6 +-
libsoup/soup-auth.h | 6 +-
libsoup/soup-autocleanups.h | 6 +-
libsoup/soup-body-input-stream.h | 6 +-
libsoup/soup-body-output-stream.h | 6 +-
libsoup/soup-cache-client-input-stream.h | 6 +-
libsoup/soup-cache-private.h | 6 +-
libsoup/soup-cache.h | 6 +-
libsoup/soup-client-input-stream.h | 6 +-
libsoup/soup-connection-auth.h | 6 +-
libsoup/soup-connection.h | 6 +-
libsoup/soup-content-decoder.h | 6 +-
libsoup/soup-content-processor.h | 6 +-
libsoup/soup-content-sniffer-stream.h | 6 +-
libsoup/soup-content-sniffer.h | 6 +-
libsoup/soup-converter-wrapper.h | 6 +-
libsoup/soup-cookie-jar-db.h | 6 +-
libsoup/soup-cookie-jar-sqlite.h | 6 +-
libsoup/soup-cookie-jar-text.h | 6 +-
libsoup/soup-cookie-jar.h | 6 +-
libsoup/soup-cookie.h | 6 +-
libsoup/soup-date.h | 6 +-
libsoup/soup-directory-input-stream.h | 6 +-
libsoup/soup-filter-input-stream.h | 6 +-
libsoup/soup-form.h | 6 +-
libsoup/soup-gnome-features.h | 6 +-
libsoup/soup-gnome.h | 6 +-
libsoup/soup-headers.h | 6 +-
libsoup/soup-logger.h | 6 +-
libsoup/soup-message-body.c | 6 +-
libsoup/soup-message-body.h | 6 +-
libsoup/soup-message-headers.c | 2 +-
libsoup/soup-message-headers.h | 6 +-
libsoup/soup-message-private.h | 6 +-
libsoup/soup-message-queue.h | 6 +-
libsoup/soup-message.h | 6 +-
libsoup/soup-method.h | 6 +-
libsoup/soup-misc-private.h | 6 +-
libsoup/soup-misc.c | 16 ++--
libsoup/soup-misc.h | 6 +-
libsoup/soup-multipart-input-stream.h | 6 +-
libsoup/soup-multipart.h | 6 +-
libsoup/soup-password-manager-gnome.h | 6 +-
libsoup/soup-password-manager.h | 6 +-
libsoup/soup-path-map.h | 6 +-
libsoup/soup-portability.h | 6 +-
libsoup/soup-proxy-resolver-default.h | 6 +-
libsoup/soup-proxy-resolver-gnome.h | 6 +-
libsoup/soup-proxy-resolver-wrapper.h | 6 +-
libsoup/soup-proxy-resolver.c | 31 ++++++
libsoup/soup-proxy-resolver.h | 12 +-
libsoup/soup-proxy-uri-resolver.h | 6 +-
libsoup/soup-request-data.h | 6 +-
libsoup/soup-request-file.h | 6 +-
libsoup/soup-request-http.h | 6 +-
libsoup/soup-request.h | 6 +-
libsoup/soup-requester.h | 6 +-
libsoup/soup-server.c | 2 +-
libsoup/soup-server.h | 6 +-
libsoup/soup-session-async.h | 6 +-
libsoup/soup-session-feature.h | 4 +-
libsoup/soup-session-private.h | 6 +-
libsoup/soup-session-sync.h | 6 +-
libsoup/soup-session.c | 2 +-
libsoup/soup-session.h | 6 +-
libsoup/soup-socket-private.h | 6 +-
libsoup/soup-socket.c | 20 +++-
libsoup/soup-socket.h | 6 +-
libsoup/soup-status.h | 6 +-
libsoup/soup-tld-private.h | 6 +-
libsoup/soup-types.h | 4 +-
libsoup/soup-uri.c | 4 +-
libsoup/soup-uri.h | 6 +-
libsoup/soup-value-utils.h | 6 +-
libsoup/soup-version.c | 4 +-
libsoup/soup-version.h.in | 6 +-
libsoup/soup-xmlrpc-old.h | 6 +-
libsoup/soup-xmlrpc.h | 6 +-
libsoup/soup.h | 6 +-
93 files changed, 344 insertions(+), 472 deletions(-)
---
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 4232be6..f5d60d1 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
@@ -281,7 +281,7 @@ Soup_2_4_gir_INCLUDES = Gio-2.0
Soup_2_4_gir_CFLAGS = $(AM_CPPFLAGS) $(SOUP_UNSTABLE_REQUEST_CFLAG)
Soup_2_4_gir_LIBS = libsoup-2.4.la
Soup_2_4_gir_EXPORT_PACKAGES = libsoup-2.4
-Soup_2_4_gir_SCANNERFLAGS = --c-include "libsoup/soup.h"
+Soup_2_4_gir_SCANNERFLAGS = --c-include "libsoup/soup.h" --warn-all
Soup_2_4_gir_FILES = \
$(addprefix $(srcdir)/, $(gi_soup_files)) \
$(foreach f,$(gi_built_soup_files), \
diff --git a/libsoup/Soup-2.4-custom.vala b/libsoup/Soup-2.4-custom.vala
index 95c2ad9..ffd1849 100644
--- a/libsoup/Soup-2.4-custom.vala
+++ b/libsoup/Soup-2.4-custom.vala
@@ -1,168 +1,6 @@
namespace Soup {
- [CCode (type_id = "soup_auth_domain_basic_get_type ()", cheader_filename = "libsoup/soup.h")]
- public class AuthDomainBasic : Soup.AuthDomain {
- public static void set_auth_callback (Soup.AuthDomain domain, owned
Soup.AuthDomainBasicAuthCallback callback);
- }
-
- [CCode (type_id = "soup_auth_domain_digest_get_type ()", cheader_filename = "libsoup/soup.h")]
- public class AuthDomainDigest : Soup.AuthDomain {
- public static void set_auth_callback (Soup.AuthDomain domain, owned
Soup.AuthDomainDigestAuthCallback callback);
- }
-
- [Compact]
- [CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id =
"soup_buffer_get_type ()", cheader_filename = "libsoup/soup.h")]
- public class Buffer {
- [CCode (has_construct_function = false)]
- 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,
- CERTIFICATE,
- HANDSHAKE_FAILED;
- public static GLib.Quark quark ();
- }
-
- [Compact]
- [CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_uri_get_type
()", cheader_filename = "libsoup/soup.h")]
- public class URI {
- [CCode (has_construct_function = false)]
- public URI.with_base (Soup.URI @base, string uri_string);
- }
-
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.build_fault")]
- [PrintfFormat]
- public static unowned string xmlrpc_build_fault (int fault_code, string fault_format, ...);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.build_method_call")]
- public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] @params);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.build_method_response")]
- public static unowned string xmlrpc_build_method_response (GLib.Value value);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.error_quark")]
- public static GLib.Quark xmlrpc_error_quark ();
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.extract_method_call")]
- [CCode (sentinel = "G_TYPE_INVALID")]
- public static bool xmlrpc_extract_method_call (string method_call, int length, out unowned string
method_name, ...);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.extract_method_response")]
- [CCode (sentinel = "G_TYPE_INVALID")]
- public static bool xmlrpc_extract_method_response (string method_response, int length, ...) throws
GLib.Error;
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.fault_quark")]
- public static GLib.Quark xmlrpc_fault_quark ();
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.parse_method_call")]
- public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string
method_name, out unowned GLib.ValueArray @params);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.parse_method_response")]
- public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value
value) throws GLib.Error;
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.request_new")]
- [CCode (sentinel = "G_TYPE_INVALID")]
- public static unowned Soup.Message xmlrpc_request_new (string uri, string method_name, ...);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.set_fault")]
- [PrintfFormat]
- public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format, ...);
- [Version (deprecated_since = "vala-0.12", replacement = "XMLRPC.set_response")]
- [CCode (sentinel = "G_TYPE_INVALID")]
- public static void xmlrpc_set_response (Soup.Message msg, ...);
-
- [Version (deprecated_since = "vala-0.12", replacement = "Form.decode")]
- public static GLib.HashTable<string,string> form_decode (string encoded_form);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.decode_multipart")]
- public static GLib.HashTable<string,string> form_decode_multipart (Soup.Message msg, string
file_control_name, out string filename, out string content_type, out Soup.Buffer file);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.encode")]
- public static string form_encode (...);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.encode_datalist")]
- public static string form_encode_datalist (void* form_data_set);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.encode_hash")]
- public static string form_encode_hash (GLib.HashTable<string,string> form_data_set);
- [Version (deprecated_since = "vala-0.12")]
- public static string form_encode_valist (string first_field, void* args);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.request_new")]
- public static Soup.Message form_request_new (string method, string uri, ...);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.request_new_from_datalist")]
- public static Soup.Message form_request_new_from_datalist (string method, string uri, void*
form_data_set);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.request_new_from_hash")]
- public static Soup.Message form_request_new_from_hash (string method, string uri,
GLib.HashTable<string,string> form_data_set);
- [Version (deprecated_since = "vala-0.12", replacement = "Form.request_new_from_multipart")]
- public static Soup.Message form_request_new_from_multipart (string uri, Soup.Multipart multipart);
- [Version (deprecated_since = "vala-0.14", replacement = "SSLError.quark")]
- public static GLib.Quark ssl_error_quark ();
-
[Version (deprecated_since = "vala-0.22", replacement = "Status.get_phrase")]
public static unowned string status_get_phrase (uint status_code);
[Version (deprecated_since = "vala-0.22", replacement = "Status.proxify")]
public static uint status_proxify (uint status_code);
- [Version (deprecated_since = "vala-0.22", replacement = "Status")]
- [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_", type_id =
"soup_known_status_code_get_type ()")]
- public enum KnownStatusCode {
- NONE,
- CANCELLED,
- CANT_RESOLVE,
- CANT_RESOLVE_PROXY,
- CANT_CONNECT,
- CANT_CONNECT_PROXY,
- SSL_FAILED,
- IO_ERROR,
- MALFORMED,
- TRY_AGAIN,
- TOO_MANY_REDIRECTS,
- TLS_FAILED,
- CONTINUE,
- SWITCHING_PROTOCOLS,
- PROCESSING,
- OK,
- CREATED,
- ACCEPTED,
- NON_AUTHORITATIVE,
- NO_CONTENT,
- RESET_CONTENT,
- PARTIAL_CONTENT,
- MULTI_STATUS,
- MULTIPLE_CHOICES,
- MOVED_PERMANENTLY,
- FOUND,
- MOVED_TEMPORARILY,
- SEE_OTHER,
- NOT_MODIFIED,
- USE_PROXY,
- NOT_APPEARING_IN_THIS_PROTOCOL,
- TEMPORARY_REDIRECT,
- BAD_REQUEST,
- UNAUTHORIZED,
- PAYMENT_REQUIRED,
- FORBIDDEN,
- NOT_FOUND,
- METHOD_NOT_ALLOWED,
- NOT_ACCEPTABLE,
- PROXY_AUTHENTICATION_REQUIRED,
- PROXY_UNAUTHORIZED,
- REQUEST_TIMEOUT,
- CONFLICT,
- GONE,
- LENGTH_REQUIRED,
- PRECONDITION_FAILED,
- REQUEST_ENTITY_TOO_LARGE,
- REQUEST_URI_TOO_LONG,
- UNSUPPORTED_MEDIA_TYPE,
- REQUESTED_RANGE_NOT_SATISFIABLE,
- INVALID_RANGE,
- EXPECTATION_FAILED,
- UNPROCESSABLE_ENTITY,
- LOCKED,
- FAILED_DEPENDENCY,
- INTERNAL_SERVER_ERROR,
- NOT_IMPLEMENTED,
- BAD_GATEWAY,
- SERVICE_UNAVAILABLE,
- GATEWAY_TIMEOUT,
- HTTP_VERSION_NOT_SUPPORTED,
- INSUFFICIENT_STORAGE,
- NOT_EXTENDED
- }
-
- public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3,
Soup.Address p4);
}
diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
index 43b6d04..f3de913 100644
--- a/libsoup/Soup-2.4.metadata
+++ b/libsoup/Soup-2.4.metadata
@@ -1,7 +1,5 @@
// Vala-specific
-AuthDomain
- .add_path#property skip
- .remove_path#property skip
+
form_* parent="Soup.Form" name="form_(.+)"
form_encode_datalist.form_data_set type_arguments="string"
form_request_new_from_datalist.form_data_set type_arguments="string"
@@ -10,77 +8,40 @@ XMLRPCFault errordomain parent="Soup.XMLRPC" name="Fault"
XMLRPCError parent="Soup.XMLRPC" name="Error"
xmlrpc_set_response.type skip
HTTPVersion.http_* name="http_(.+)"
+AuthDomain
+ .add_path#property skip
+ .remove_path#property skip
// Backwards compatibility
-KnownStatusCode skip
Requester deprecated_since="2.42" replacement="Session"
-Requester
- .request* skip=false unowned=false
+KnownStatusCode deprecated_since="2.44" replacement="Status"
+ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
// Report upstream
-Soup cheader_filename="libsoup/soup.h"
-add_* skip=false type="unowned GLib.TimeoutSource"
AuthDomain
- .accepts#method skip
- .challenge#virtual_method vfunc_name="challenge"
- .basic_set_auth_callback skip
- .digest_set_auth_callback skip
-AuthDomainBasic.new skip=false
-AuthDomainDigest.new skip=false
-Buffer.new.data type="uint8[]" array_length_idx=2
-Buffer.new_with_owner.data type="uint8[]" array_length_idx=1
-Buffer.new_subbuffer skip
-Buffer.new_with_owner.owner_dnotify nullable
-CookieJar.all_cookies type_arguments="Cookie"
-ContentSniffer.sniff.params type_arguments="string,string" nullable out unowned=false
+ .accepts#method name="accepts_authorization"
form_* skip=false
-header_parse_list type_arguments="string"
-header_parse_quality_list type_arguments="string"
- .unacceptable out type_arguments="string"
Message
.add_header_handler skip=false
.add_status_code_handler skip=false
- .request_*#property skip
- .response_*#property skip
- .set_request.req_body type="uint8[]" array_length_idx=3
-MessageHeaders
- .get_ranges.ranges out type="Soup.Range[]" array_length_idx=2
Server
.new skip=false
- .async_context type="GLib.MainContext"
Session
- .async_context type="GLib.MainContext"
- .get_features type_arguments="weak Soup.SessionFeature"
.send_async.cancellable#parameter default=null
Session*.new_with_options skip=false
Socket
- .async_context type="GLib.MainContext"
.new skip=false
- .read.buffer type="uint8[]" array_length_idx=1
- .read_until.buffer type="uint8[]" array_length_idx=1
- .read_until.nread out
- .write.buffer type="uint8[]" array_length_idx=1
URI
- .new_with_base skip
.set_query_from_fields skip=false
-uri_encode.escape_extra nullable
// uri_host_*.* type="Soup.URI"
-ProxyURIResolverCallback.user_data skip
xmlrpc_* skip=false
// xmlrpc_build_method_call.params array array_length_idx=2
xmlrpc_extract_method_response throws="Soup.XMLRPC.Fault"
.error skip
.type skip
value_* skip=false
-ProxyURIResolver
- .get_proxy_uri_async skip=false
- .get_proxy_uri_async.callback owned scope="async"
- .get_proxy_uri_async.async_context nullable
- .get_proxy_uri_sync.proxy_uri out unowned=false
// Not enough GIR information
-Buffer.data type="uint8[]" array_length_field="length"
-MessageBody.data type="uint8[]" array_length_field="length"
xmlrpc_parse_method_response throws="Soup.XMLRPC.Fault"
Date
.new_from_time_t.when type="time_t"
diff --git a/libsoup/soup-address.h b/libsoup/soup-address.h
index af178de..52c1b8b 100644
--- a/libsoup/soup-address.h
+++ b/libsoup/soup-address.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_ADDRESS_H
-#define SOUP_ADDRESS_H
+#ifndef __SOUP_ADDRESS_H__
+#define __SOUP_ADDRESS_H__
#include <sys/types.h>
@@ -107,4 +107,4 @@ gboolean soup_address_equal_by_ip (gconstpointer addr1,
G_END_DECLS
-#endif /* SOUP_ADDRESS_H */
+#endif /* __SOUP_ADDRESS_H__ */
diff --git a/libsoup/soup-auth-basic.h b/libsoup/soup-auth-basic.h
index 639bf03..b793687 100644
--- a/libsoup/soup-auth-basic.h
+++ b/libsoup/soup-auth-basic.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_AUTH_BASIC_H
-#define SOUP_AUTH_BASIC_H 1
+#ifndef __SOUP_AUTH_BASIC_H__
+#define __SOUP_AUTH_BASIC_H__ 1
#include "soup-auth.h"
@@ -24,4 +24,4 @@ typedef struct {
} SoupAuthBasicClass;
-#endif /*SOUP_AUTH_BASIC_H*/
+#endif /* __SOUP_AUTH_BASIC_H__ */
diff --git a/libsoup/soup-auth-digest.h b/libsoup/soup-auth-digest.h
index 0165f74..59fd748 100644
--- a/libsoup/soup-auth-digest.h
+++ b/libsoup/soup-auth-digest.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_AUTH_DIGEST_H
-#define SOUP_AUTH_DIGEST_H 1
+#ifndef __SOUP_AUTH_DIGEST_H__
+#define __SOUP_AUTH_DIGEST_H__ 1
#include "soup-auth.h"
@@ -61,4 +61,4 @@ void soup_auth_digest_compute_response (const char *method,
int nc,
char response[33]);
-#endif /*SOUP_AUTH_DIGEST_H*/
+#endif /* __SOUP_AUTH_DIGEST_H__ */
diff --git a/libsoup/soup-auth-domain-basic.c b/libsoup/soup-auth-domain-basic.c
index aef2f68..97a65cc 100644
--- a/libsoup/soup-auth-domain-basic.c
+++ b/libsoup/soup-auth-domain-basic.c
@@ -130,7 +130,7 @@ soup_auth_domain_basic_new (const char *optname1, ...)
/**
* SoupAuthDomainBasicAuthCallback:
- * @domain: the domain
+ * @domain: (type SoupAuthDomainBasic): the domain
* @msg: the message being authenticated
* @username: the username provided by the client
* @password: the password provided by the client
@@ -156,7 +156,7 @@ soup_auth_domain_basic_new (const char *optname1, ...)
/**
* soup_auth_domain_basic_set_auth_callback:
- * @domain: the domain
+ * @domain: (type SoupAuthDomainBasic): the domain
* @callback: the callback
* @user_data: data to pass to @auth_callback
* @dnotify: destroy notifier to free @user_data when @domain
@@ -311,6 +311,11 @@ soup_auth_domain_basic_class_init (SoupAuthDomainBasicClass *basic_class)
* Alias for the #SoupAuthDomainBasic:auth-callback property.
* (The #SoupAuthDomainBasicAuthCallback.)
**/
+ /**
+ * SoupAuthDomainBasic:auth-callback: (type SoupAuthDomainBasicAuthCallback)
+ *
+ * The #SoupAuthDomainBasicAuthCallback
+ */
g_object_class_install_property (
object_class, PROP_AUTH_CALLBACK,
g_param_spec_pointer (SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK,
@@ -323,6 +328,11 @@ soup_auth_domain_basic_class_init (SoupAuthDomainBasicClass *basic_class)
* Alias for the #SoupAuthDomainBasic:auth-data property.
* (The data to pass to the #SoupAuthDomainBasicAuthCallback.)
**/
+ /**
+ * SoupAuthDomainBasic:auth-data:
+ *
+ * The data to pass to the #SoupAuthDomainBasicAuthCallback
+ */
g_object_class_install_property (
object_class, PROP_AUTH_DATA,
g_param_spec_pointer (SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA,
diff --git a/libsoup/soup-auth-domain-basic.h b/libsoup/soup-auth-domain-basic.h
index f1caeb2..87d129b 100644
--- a/libsoup/soup-auth-domain-basic.h
+++ b/libsoup/soup-auth-domain-basic.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Novell, Inc.
*/
-#ifndef SOUP_AUTH_DOMAIN_BASIC_H
-#define SOUP_AUTH_DOMAIN_BASIC_H 1
+#ifndef __SOUP_AUTH_DOMAIN_BASIC_H__
+#define __SOUP_AUTH_DOMAIN_BASIC_H__ 1
#include <libsoup/soup-auth-domain.h>
@@ -56,4 +56,4 @@ void soup_auth_domain_basic_set_auth_callback (SoupAuthDomain *domain,
G_END_DECLS
-#endif /* SOUP_AUTH_DOMAIN_BASIC_H */
+#endif /* __SOUP_AUTH_DOMAIN_BASIC_H__ */
diff --git a/libsoup/soup-auth-domain-digest.c b/libsoup/soup-auth-domain-digest.c
index 8bdb561..9e3a121 100644
--- a/libsoup/soup-auth-domain-digest.c
+++ b/libsoup/soup-auth-domain-digest.c
@@ -133,7 +133,7 @@ soup_auth_domain_digest_new (const char *optname1, ...)
/**
* SoupAuthDomainDigestAuthCallback:
- * @domain: the domain
+ * @domain: (type SoupAuthDomainDigest): the domain
* @msg: the message being authenticated
* @username: the username provided by the client
* @user_data: the data passed to soup_auth_domain_digest_set_auth_callback()
@@ -150,7 +150,7 @@ soup_auth_domain_digest_new (const char *optname1, ...)
/**
* soup_auth_domain_digest_set_auth_callback:
- * @domain: the domain
+ * @domain: (type SoupAuthDomainDigest): the domain
* @callback: the callback
* @user_data: data to pass to @auth_callback
* @dnotify: destroy notifier to free @user_data when @domain
@@ -417,6 +417,11 @@ soup_auth_domain_digest_class_init (SoupAuthDomainDigestClass *digest_class)
* Alias for the #SoupAuthDomainDigest:auth-callback property.
* (The #SoupAuthDomainDigestAuthCallback.)
**/
+ /**
+ * SoupAuthDomainDigest:auth-callback: (type SoupAuthDomainDigestAuthCallback)
+ *
+ * The #SoupAuthDomainDigestAuthCallback
+ */
g_object_class_install_property (
object_class, PROP_AUTH_CALLBACK,
g_param_spec_pointer (SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK,
@@ -429,6 +434,11 @@ soup_auth_domain_digest_class_init (SoupAuthDomainDigestClass *digest_class)
* Alias for the #SoupAuthDomainDigest:auth-callback property.
* (The #SoupAuthDomainDigestAuthCallback.)
**/
+ /**
+ * SoupAuthDomainDigest:auth-data:
+ *
+ * The data to pass to the #SoupAuthDomainDigestAuthCallback
+ */
g_object_class_install_property (
object_class, PROP_AUTH_DATA,
g_param_spec_pointer (SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA,
diff --git a/libsoup/soup-auth-domain-digest.h b/libsoup/soup-auth-domain-digest.h
index 8940a18..8dee9fd 100644
--- a/libsoup/soup-auth-domain-digest.h
+++ b/libsoup/soup-auth-domain-digest.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Novell, Inc.
*/
-#ifndef SOUP_AUTH_DOMAIN_DIGEST_H
-#define SOUP_AUTH_DOMAIN_DIGEST_H 1
+#ifndef __SOUP_AUTH_DOMAIN_DIGEST_H__
+#define __SOUP_AUTH_DOMAIN_DIGEST_H__ 1
#include <libsoup/soup-auth-domain.h>
@@ -60,4 +60,4 @@ char *soup_auth_domain_digest_encode_password (const char *username,
G_END_DECLS
-#endif /* SOUP_AUTH_DOMAIN_DIGEST_H */
+#endif /* __SOUP_AUTH_DOMAIN_DIGEST_H__ */
diff --git a/libsoup/soup-auth-domain.c b/libsoup/soup-auth-domain.c
index 06c9e64..cf26e37 100644
--- a/libsoup/soup-auth-domain.c
+++ b/libsoup/soup-auth-domain.c
@@ -242,6 +242,11 @@ soup_auth_domain_class_init (SoupAuthDomainClass *auth_domain_class)
* Alias for the #SoupAuthDomain:filter property. (The
* #SoupAuthDomainFilter for the domain.)
**/
+ /**
+ * SoupAuthDomain:filter: (type SoupAuthDomainFilter)
+ *
+ * The #SoupAuthDomainFilter for the domain
+ */
g_object_class_install_property (
object_class, PROP_FILTER,
g_param_spec_pointer (SOUP_AUTH_DOMAIN_FILTER,
@@ -266,6 +271,11 @@ soup_auth_domain_class_init (SoupAuthDomainClass *auth_domain_class)
* Alias for the #SoupAuthDomain:generic-auth-callback property.
* (The #SoupAuthDomainGenericAuthCallback.)
**/
+ /**
+ * SoupAuthDomain:generic-auth-callback: (type SoupAuthDomainGenericAuthCallback)
+ *
+ * The #SoupAuthDomainGenericAuthCallback for the domain
+ */
g_object_class_install_property (
object_class, PROP_GENERIC_AUTH_CALLBACK,
g_param_spec_pointer (SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK,
@@ -587,7 +597,7 @@ soup_auth_domain_accepts (SoupAuthDomain *domain, SoupMessage *msg)
}
/**
- * soup_auth_domain_challenge:
+ * soup_auth_domain_challenge: (virtual challenge)
* @domain: a #SoupAuthDomain
* @msg: a #SoupMessage
*
diff --git a/libsoup/soup-auth-domain.h b/libsoup/soup-auth-domain.h
index 2bec096..1565350 100644
--- a/libsoup/soup-auth-domain.h
+++ b/libsoup/soup-auth-domain.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Novell, Inc.
*/
-#ifndef SOUP_AUTH_DOMAIN_H
-#define SOUP_AUTH_DOMAIN_H 1
+#ifndef __SOUP_AUTH_DOMAIN_H__
+#define __SOUP_AUTH_DOMAIN_H__ 1
#include <libsoup/soup-types.h>
@@ -107,4 +107,4 @@ gboolean soup_auth_domain_try_generic_auth_callback (SoupAuthDomain *domain,
G_END_DECLS
-#endif /* SOUP_AUTH_DOMAIN_H */
+#endif /* __SOUP_AUTH_DOMAIN_H__ */
diff --git a/libsoup/soup-auth-manager.h b/libsoup/soup-auth-manager.h
index c935d99..cf38936 100644
--- a/libsoup/soup-auth-manager.h
+++ b/libsoup/soup-auth-manager.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Red Hat, Inc.
*/
-#ifndef SOUP_AUTH_MANAGER_H
-#define SOUP_AUTH_MANAGER_H 1
+#ifndef __SOUP_AUTH_MANAGER_H__
+#define __SOUP_AUTH_MANAGER_H__ 1
#include "soup-types.h"
#include "soup-auth.h"
@@ -46,4 +46,4 @@ void soup_auth_manager_clear_cached_credentials (SoupAuthManager *manager);
G_END_DECLS
-#endif /* SOUP_AUTH_MANAGER_H */
+#endif /* __SOUP_AUTH_MANAGER_H__ */
diff --git a/libsoup/soup-auth-negotiate.h b/libsoup/soup-auth-negotiate.h
index e976644..5c3916b 100644
--- a/libsoup/soup-auth-negotiate.h
+++ b/libsoup/soup-auth-negotiate.h
@@ -4,8 +4,8 @@
* Copyright (C) 2016 Red Hat, Inc.
*/
-#ifndef SOUP_AUTH_NEGOTIATE_H
-#define SOUP_AUTH_NEGOTIATE_H 1
+#ifndef __SOUP_AUTH_NEGOTIATE_H__
+#define __SOUP_AUTH_NEGOTIATE_H__ 1
#include "soup-connection-auth.h"
@@ -25,4 +25,4 @@ typedef struct {
} SoupAuthNegotiateClass;
-#endif /* SOUP_AUTH_NEGOTIATE_H */
+#endif /* __SOUP_AUTH_NEGOTIATE_H__ */
diff --git a/libsoup/soup-auth-ntlm.h b/libsoup/soup-auth-ntlm.h
index 43c4085..ef07353 100644
--- a/libsoup/soup-auth-ntlm.h
+++ b/libsoup/soup-auth-ntlm.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Red Hat, Inc.
*/
-#ifndef SOUP_AUTH_NTLM_H
-#define SOUP_AUTH_NTLM_H 1
+#ifndef __SOUP_AUTH_NTLM_H__
+#define __SOUP_AUTH_NTLM_H__ 1
#include "soup-connection-auth.h"
@@ -24,4 +24,4 @@ typedef struct {
} SoupAuthNTLMClass;
-#endif /* SOUP_AUTH_NTLM_H */
+#endif /* __SOUP_AUTH_NTLM_H__ */
diff --git a/libsoup/soup-auth.h b/libsoup/soup-auth.h
index 0defcc6..86a829b 100644
--- a/libsoup/soup-auth.h
+++ b/libsoup/soup-auth.h
@@ -3,8 +3,8 @@
* Copyright (C) 2001-2003, Ximian, Inc.
*/
-#ifndef SOUP_AUTH_H
-#define SOUP_AUTH_H 1
+#ifndef __SOUP_AUTH_H__
+#define __SOUP_AUTH_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-headers.h>
@@ -146,4 +146,4 @@ gboolean soup_auth_negotiate_supported (void);
G_END_DECLS
-#endif /* SOUP_AUTH_H */
+#endif /* __SOUP_AUTH_H__ */
diff --git a/libsoup/soup-autocleanups.h b/libsoup/soup-autocleanups.h
index 910abe7..1895eb0 100644
--- a/libsoup/soup-autocleanups.h
+++ b/libsoup/soup-autocleanups.h
@@ -19,8 +19,8 @@
#error "Only <libsoup/soup.h> can be included directly."
#endif
-#ifndef SOUP_AUTOCLEANUPS_H
-#define SOUP_AUTOCLEANUPS_H
+#ifndef __SOUP_AUTOCLEANUPS_H__
+#define __SOUP_AUTOCLEANUPS_H__
#if SOUP_VERSION_MAX_ALLOWED >= SOUP_VERSION_2_52
#ifndef __GI_SCANNER__
@@ -65,4 +65,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupXMLRPCParams, soup_xmlrpc_params_free)
#endif
#endif
-#endif /* SOUP_AUTOCLEANUPS_H */
+#endif /* __SOUP_AUTOCLEANUPS_H__ */
diff --git a/libsoup/soup-body-input-stream.h b/libsoup/soup-body-input-stream.h
index 7732e5e..bd04e5f 100644
--- a/libsoup/soup-body-input-stream.h
+++ b/libsoup/soup-body-input-stream.h
@@ -3,8 +3,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#ifndef SOUP_BODY_INPUT_STREAM_H
-#define SOUP_BODY_INPUT_STREAM_H 1
+#ifndef __SOUP_BODY_INPUT_STREAM_H__
+#define __SOUP_BODY_INPUT_STREAM_H__ 1
#include "soup-types.h"
#include "soup-filter-input-stream.h"
@@ -45,4 +45,4 @@ GInputStream *soup_body_input_stream_new (GInputStream *base_stream,
G_END_DECLS
-#endif /* SOUP_BODY_INPUT_STREAM_H */
+#endif /* __SOUP_BODY_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-body-output-stream.h b/libsoup/soup-body-output-stream.h
index 8bd8970..c817cc7 100644
--- a/libsoup/soup-body-output-stream.h
+++ b/libsoup/soup-body-output-stream.h
@@ -3,8 +3,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#ifndef SOUP_BODY_OUTPUT_STREAM_H
-#define SOUP_BODY_OUTPUT_STREAM_H 1
+#ifndef __SOUP_BODY_OUTPUT_STREAM_H__
+#define __SOUP_BODY_OUTPUT_STREAM_H__ 1
#include "soup-types.h"
#include "soup-message-headers.h"
@@ -44,4 +44,4 @@ GOutputStream *soup_body_output_stream_new (GOutputStream *base_stream,
G_END_DECLS
-#endif /* SOUP_BODY_OUTPUT_STREAM_H */
+#endif /* __SOUP_BODY_OUTPUT_STREAM_H__ */
diff --git a/libsoup/soup-cache-client-input-stream.h b/libsoup/soup-cache-client-input-stream.h
index 17f8359..2c9da06 100644
--- a/libsoup/soup-cache-client-input-stream.h
+++ b/libsoup/soup-cache-client-input-stream.h
@@ -3,8 +3,8 @@
* Copyright 2015 Igalia S.L.
*/
-#ifndef SOUP_CACHE_CLIENT_INPUT_STREAM_H
-#define SOUP_CACHE_CLIENT_INPUT_STREAM_H 1
+#ifndef __SOUP_CACHE_CLIENT_INPUT_STREAM_H__
+#define __SOUP_CACHE_CLIENT_INPUT_STREAM_H__ 1
#include "soup-types.h"
@@ -33,4 +33,4 @@ GInputStream *soup_cache_client_input_stream_new (GInputStream *base_stream);
G_END_DECLS
-#endif /* SOUP_CACHE_CLIENT_INPUT_STREAM_H */
+#endif /* __SOUP_CACHE_CLIENT_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-cache-private.h b/libsoup/soup-cache-private.h
index e17fc0d..20b10c3 100644
--- a/libsoup/soup-cache-private.h
+++ b/libsoup/soup-cache-private.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_CACHE_PRIVATE_H
-#define SOUP_CACHE_PRIVATE_H 1
+#ifndef __SOUP_CACHE_PRIVATE_H__
+#define __SOUP_CACHE_PRIVATE_H__ 1
#include "soup-cache.h"
#include <libsoup/soup-message.h>
@@ -43,4 +43,4 @@ void soup_cache_update_from_conditional_request (SoupCache *cach
G_END_DECLS
-#endif /* SOUP_CACHE_PRIVATE_H */
+#endif /* __SOUP_CACHE_PRIVATE_H__ */
diff --git a/libsoup/soup-cache.h b/libsoup/soup-cache.h
index ce19b5e..6ad7470 100644
--- a/libsoup/soup-cache.h
+++ b/libsoup/soup-cache.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_CACHE_H
-#define SOUP_CACHE_H 1
+#ifndef __SOUP_CACHE_H__
+#define __SOUP_CACHE_H__ 1
#include <libsoup/soup-types.h>
#include <gio/gio.h>
@@ -98,5 +98,5 @@ guint soup_cache_get_max_size (SoupCache *cache);
G_END_DECLS
-#endif /* SOUP_CACHE_H */
+#endif /* __SOUP_CACHE_H__ */
diff --git a/libsoup/soup-client-input-stream.h b/libsoup/soup-client-input-stream.h
index 098c607..c007047 100644
--- a/libsoup/soup-client-input-stream.h
+++ b/libsoup/soup-client-input-stream.h
@@ -3,8 +3,8 @@
* Copyright 2010-2012 Red Hat, Inc.
*/
-#ifndef SOUP_CLIENT_INPUT_STREAM_H
-#define SOUP_CLIENT_INPUT_STREAM_H 1
+#ifndef __SOUP_CLIENT_INPUT_STREAM_H__
+#define __SOUP_CLIENT_INPUT_STREAM_H__ 1
#include "soup-types.h"
#include "soup-filter-input-stream.h"
@@ -43,4 +43,4 @@ GInputStream *soup_client_input_stream_new (GInputStream *base_stream,
G_END_DECLS
-#endif /* SOUP_CLIENT_INPUT_STREAM_H */
+#endif /* __SOUP_CLIENT_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-connection-auth.h b/libsoup/soup-connection-auth.h
index c5fbe7b..576ff61 100644
--- a/libsoup/soup-connection-auth.h
+++ b/libsoup/soup-connection-auth.h
@@ -3,8 +3,8 @@
* Copyright (C) 2010 Red Hat, Inc.
*/
-#ifndef SOUP_CONNECTION_AUTH_H
-#define SOUP_CONNECTION_AUTH_H 1
+#ifndef __SOUP_CONNECTION_AUTH_H__
+#define __SOUP_CONNECTION_AUTH_H__ 1
#include <libsoup/soup-auth.h>
@@ -52,4 +52,4 @@ gpointer soup_connection_auth_get_connection_state_for_message
SoupMessage *message);
G_END_DECLS
-#endif /* SOUP_CONNECTION_AUTH_H */
+#endif /* __SOUP_CONNECTION_AUTH_H__ */
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index fe817de..45e80b2 100644
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_CONNECTION_H
-#define SOUP_CONNECTION_H 1
+#ifndef __SOUP_CONNECTION_H__
+#define __SOUP_CONNECTION_H__ 1
#include "soup-types.h"
#include "soup-message-private.h"
@@ -82,4 +82,4 @@ void soup_connection_send_request (SoupConnection *conn,
G_END_DECLS
-#endif /* SOUP_CONNECTION_H */
+#endif /* __SOUP_CONNECTION_H__ */
diff --git a/libsoup/soup-content-decoder.h b/libsoup/soup-content-decoder.h
index 471f813..1269539 100644
--- a/libsoup/soup-content-decoder.h
+++ b/libsoup/soup-content-decoder.h
@@ -3,8 +3,8 @@
* Copyright (C) 2009 Red Hat, Inc.
*/
-#ifndef SOUP_CONTENT_DECODER_H
-#define SOUP_CONTENT_DECODER_H 1
+#ifndef __SOUP_CONTENT_DECODER_H__
+#define __SOUP_CONTENT_DECODER_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-message-body.h>
@@ -42,4 +42,4 @@ GType soup_content_decoder_get_type (void);
G_END_DECLS
-#endif /* SOUP_CONTENT_DECODER_H */
+#endif /* __SOUP_CONTENT_DECODER_H__ */
diff --git a/libsoup/soup-content-processor.h b/libsoup/soup-content-processor.h
index 8ee04b2..c68dec9 100644
--- a/libsoup/soup-content-processor.h
+++ b/libsoup/soup-content-processor.h
@@ -4,8 +4,8 @@
*/
-#ifndef SOUP_CONTENT_PROCESSOR_H
-#define SOUP_CONTENT_PROCESSOR_H 1
+#ifndef __SOUP_CONTENT_PROCESSOR_H__
+#define __SOUP_CONTENT_PROCESSOR_H__ 1
#include <libsoup/soup-types.h>
#include <gio/gio.h>
@@ -53,4 +53,4 @@ SoupProcessingStage soup_content_processor_get_processing_stage (SoupContentProc
G_END_DECLS
-#endif /* SOUP_CONTENT_PROCESSOR_H */
+#endif /* __SOUP_CONTENT_PROCESSOR_H__ */
diff --git a/libsoup/soup-content-sniffer-stream.h b/libsoup/soup-content-sniffer-stream.h
index ab230f3..ede77dd 100644
--- a/libsoup/soup-content-sniffer-stream.h
+++ b/libsoup/soup-content-sniffer-stream.h
@@ -3,8 +3,8 @@
* Copyright (C) 2010 Red Hat, Inc.
*/
-#ifndef SOUP_CONTENT_SNIFFER_STREAM_H
-#define SOUP_CONTENT_SNIFFER_STREAM_H 1
+#ifndef __SOUP_CONTENT_SNIFFER_STREAM_H__
+#define __SOUP_CONTENT_SNIFFER_STREAM_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-content-sniffer.h>
@@ -46,4 +46,4 @@ const char *soup_content_sniffer_stream_sniff (SoupContentSnifferStream *s
G_END_DECLS
-#endif /* SOUP_CONTENT_SNIFFER_STREAM_H */
+#endif /* __SOUP_CONTENT_SNIFFER_STREAM_H__ */
diff --git a/libsoup/soup-content-sniffer.h b/libsoup/soup-content-sniffer.h
index eb1e4bd..908e0ca 100644
--- a/libsoup/soup-content-sniffer.h
+++ b/libsoup/soup-content-sniffer.h
@@ -3,8 +3,8 @@
* Copyright (C) 2009 Gustavo Noronha Silva.
*/
-#ifndef SOUP_CONTENT_SNIFFER_H
-#define SOUP_CONTENT_SNIFFER_H 1
+#ifndef __SOUP_CONTENT_SNIFFER_H__
+#define __SOUP_CONTENT_SNIFFER_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-message-body.h>
@@ -59,4 +59,4 @@ gsize soup_content_sniffer_get_buffer_size (SoupContentSniffer *s
G_END_DECLS
-#endif /* SOUP_CONTENT_SNIFFER_H */
+#endif /* __SOUP_CONTENT_SNIFFER_H__ */
diff --git a/libsoup/soup-converter-wrapper.h b/libsoup/soup-converter-wrapper.h
index 62ed9da..eb75a55 100644
--- a/libsoup/soup-converter-wrapper.h
+++ b/libsoup/soup-converter-wrapper.h
@@ -3,8 +3,8 @@
* Copyright 2011 Red Hat, Inc.
*/
-#ifndef SOUP_CONVERTER_WRAPPER_H
-#define SOUP_CONVERTER_WRAPPER_H 1
+#ifndef __SOUP_CONVERTER_WRAPPER_H__
+#define __SOUP_CONVERTER_WRAPPER_H__ 1
#include <libsoup/soup-types.h>
@@ -42,4 +42,4 @@ GConverter *soup_converter_wrapper_new (GConverter *base_converter,
G_END_DECLS
-#endif /* SOUP_CONVERTER_WRAPPER_H */
+#endif /* __SOUP_CONVERTER_WRAPPER_H__ */
diff --git a/libsoup/soup-cookie-jar-db.h b/libsoup/soup-cookie-jar-db.h
index 1a98901..90c402b 100644
--- a/libsoup/soup-cookie-jar-db.h
+++ b/libsoup/soup-cookie-jar-db.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Diego Escalante Urrelo
*/
-#ifndef SOUP_COOKIE_JAR_DB_H
-#define SOUP_COOKIE_JAR_DB_H 1
+#ifndef __SOUP_COOKIE_JAR_DB_H__
+#define __SOUP_COOKIE_JAR_DB_H__ 1
#include <libsoup/soup-cookie-jar.h>
@@ -43,4 +43,4 @@ SoupCookieJar *soup_cookie_jar_db_new (const char *filename,
G_END_DECLS
-#endif /* SOUP_COOKIE_JAR_DB_H */
+#endif /* __SOUP_COOKIE_JAR_DB_H__ */
diff --git a/libsoup/soup-cookie-jar-sqlite.h b/libsoup/soup-cookie-jar-sqlite.h
index adc2786..7f0099e 100644
--- a/libsoup/soup-cookie-jar-sqlite.h
+++ b/libsoup/soup-cookie-jar-sqlite.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Diego Escalante Urrelo
*/
-#ifndef SOUP_COOKIE_JAR_SQLITE_H
-#define SOUP_COOKIE_JAR_SQLITE_H 1
+#ifndef __SOUP_COOKIE_JAR_SQLITE_H__
+#define __SOUP_COOKIE_JAR_SQLITE_H__ 1
#include <libsoup/soup-cookie-jar-db.h>
@@ -40,4 +40,4 @@ SoupCookieJar *soup_cookie_jar_sqlite_new (const char *filename,
G_END_DECLS
-#endif /* SOUP_COOKIE_JAR_SQLITE_H */
+#endif /* __SOUP_COOKIE_JAR_SQLITE_H__ */
diff --git a/libsoup/soup-cookie-jar-text.h b/libsoup/soup-cookie-jar-text.h
index 83b8f28..c33e14b 100644
--- a/libsoup/soup-cookie-jar-text.h
+++ b/libsoup/soup-cookie-jar-text.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_COOKIE_JAR_TEXT_H
-#define SOUP_COOKIE_JAR_TEXT_H 1
+#ifndef __SOUP_COOKIE_JAR_TEXT_H__
+#define __SOUP_COOKIE_JAR_TEXT_H__ 1
#include <libsoup/soup-cookie-jar.h>
@@ -43,4 +43,4 @@ SoupCookieJar *soup_cookie_jar_text_new (const char *filename,
G_END_DECLS
-#endif /* SOUP_COOKIE_JAR_TEXT_H */
+#endif /* __SOUP_COOKIE_JAR_TEXT_H__ */
diff --git a/libsoup/soup-cookie-jar.h b/libsoup/soup-cookie-jar.h
index e77f8ab..d9c6850 100644
--- a/libsoup/soup-cookie-jar.h
+++ b/libsoup/soup-cookie-jar.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_COOKIE_JAR_H
-#define SOUP_COOKIE_JAR_H 1
+#ifndef __SOUP_COOKIE_JAR_H__
+#define __SOUP_COOKIE_JAR_H__ 1
#include <libsoup/soup-types.h>
@@ -96,4 +96,4 @@ void soup_cookie_jar_save (SoupCooki
G_END_DECLS
-#endif /* SOUP_COOKIE_JAR_H */
+#endif /* __SOUP_COOKIE_JAR_H__ */
diff --git a/libsoup/soup-cookie.h b/libsoup/soup-cookie.h
index 9624291..21973a4 100644
--- a/libsoup/soup-cookie.h
+++ b/libsoup/soup-cookie.h
@@ -3,8 +3,8 @@
* Copyright 2007, 2008 Red Hat, Inc.
*/
-#ifndef SOUP_COOKIE_H
-#define SOUP_COOKIE_H 1
+#ifndef __SOUP_COOKIE_H__
+#define __SOUP_COOKIE_H__ 1
#include <libsoup/soup-types.h>
@@ -119,4 +119,4 @@ gboolean soup_cookie_domain_matches (SoupCookie *cookie,
G_END_DECLS
-#endif /* SOUP_COOKIE_H */
+#endif /* __SOUP_COOKIE_H__ */
diff --git a/libsoup/soup-date.h b/libsoup/soup-date.h
index c6414c1..7dbbc87 100644
--- a/libsoup/soup-date.h
+++ b/libsoup/soup-date.h
@@ -4,8 +4,8 @@
* Copyright (C) 2007 Red Hat, Inc.
*/
-#ifndef SOUP_DATE_H
-#define SOUP_DATE_H 1
+#ifndef __SOUP_DATE_H__
+#define __SOUP_DATE_H__ 1
#include <time.h>
#include <libsoup/soup-types.h>
@@ -89,4 +89,4 @@ void soup_date_free (SoupDate *date);
G_END_DECLS
-#endif /* SOUP_DATE_H */
+#endif /* __SOUP_DATE_H__ */
diff --git a/libsoup/soup-directory-input-stream.h b/libsoup/soup-directory-input-stream.h
index ae2b4ba..c7a4189 100644
--- a/libsoup/soup-directory-input-stream.h
+++ b/libsoup/soup-directory-input-stream.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_DIRECTORY_INPUT_STREAM_H
-#define SOUP_DIRECTORY_INPUT_STREAM_H 1
+#ifndef __SOUP_DIRECTORY_INPUT_STREAM_H__
+#define __SOUP_DIRECTORY_INPUT_STREAM_H__ 1
#include <gio/gio.h>
#include <libsoup/soup-types.h>
@@ -59,4 +59,4 @@ GInputStream *soup_directory_input_stream_new (GFileEnumerator *enumerator,
G_END_DECLS
-#endif /* SOUP_DIRECTORY_INPUT_STREAM_H */
+#endif /* __SOUP_DIRECTORY_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-filter-input-stream.h b/libsoup/soup-filter-input-stream.h
index 276b60f..bd7277b 100644
--- a/libsoup/soup-filter-input-stream.h
+++ b/libsoup/soup-filter-input-stream.h
@@ -3,8 +3,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#ifndef SOUP_FILTER_INPUT_STREAM_H
-#define SOUP_FILTER_INPUT_STREAM_H 1
+#ifndef __SOUP_FILTER_INPUT_STREAM_H__
+#define __SOUP_FILTER_INPUT_STREAM_H__ 1
#include <libsoup/soup-types.h>
@@ -54,4 +54,4 @@ gssize soup_filter_input_stream_read_until (SoupFilterInputStream *fstre
G_END_DECLS
-#endif /* SOUP_FILTER_INPUT_STREAM_H */
+#endif /* __SOUP_FILTER_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-form.h b/libsoup/soup-form.h
index a0df034..0b9c27c 100644
--- a/libsoup/soup-form.h
+++ b/libsoup/soup-form.h
@@ -3,8 +3,8 @@
* Copyright 2008 Red Hat, Inc.
*/
-#ifndef SOUP_FORM_H
-#define SOUP_FORM_H 1
+#ifndef __SOUP_FORM_H__
+#define __SOUP_FORM_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-multipart.h>
@@ -60,4 +60,4 @@ SoupMessage *soup_form_request_new_from_multipart (const char *uri,
G_END_DECLS
-#endif /* SOUP_FORM_H */
+#endif /* __SOUP_FORM_H__ */
diff --git a/libsoup/soup-gnome-features.h b/libsoup/soup-gnome-features.h
index 18f37de..031491c 100644
--- a/libsoup/soup-gnome-features.h
+++ b/libsoup/soup-gnome-features.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_GNOME_FEATURES_H
-#define SOUP_GNOME_FEATURES_H 1
+#ifndef __SOUP_GNOME_FEATURES_H__
+#define __SOUP_GNOME_FEATURES_H__ 1
#include <libsoup/soup-types.h>
@@ -27,4 +27,4 @@ GType soup_password_manager_gnome_get_type (void);
G_END_DECLS
-#endif /* SOUP_GNOME_FEATURES_H */
+#endif /* __SOUP_GNOME_FEATURES_H__ */
diff --git a/libsoup/soup-gnome.h b/libsoup/soup-gnome.h
index a2134a4..da0fe93 100644
--- a/libsoup/soup-gnome.h
+++ b/libsoup/soup-gnome.h
@@ -3,12 +3,12 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_GNOME_H
-#define SOUP_GNOME_H 1
+#ifndef __SOUP_GNOME_H__
+#define __SOUP_GNOME_H__ 1
#include <libsoup/soup.h>
#include <libsoup/soup-cookie-jar-sqlite.h>
#include <libsoup/soup-gnome-features.h>
-#endif /* SOUP_GNOME_H */
+#endif /* __SOUP_GNOME_H__ */
diff --git a/libsoup/soup-headers.h b/libsoup/soup-headers.h
index d1f3461..79f92a7 100644
--- a/libsoup/soup-headers.h
+++ b/libsoup/soup-headers.h
@@ -3,8 +3,8 @@
* Copyright (C) 2001-2003, Ximian, Inc.
*/
-#ifndef SOUP_HEADERS_H
-#define SOUP_HEADERS_H 1
+#ifndef __SOUP_HEADERS_H__
+#define __SOUP_HEADERS_H__ 1
#include <glib.h>
#include <libsoup/soup-message.h>
@@ -71,4 +71,4 @@ void soup_header_g_string_append_param_quoted (GString *string,
G_END_DECLS
-#endif /*SOUP_HEADERS_H*/
+#endif /* __SOUP_HEADERS_H__ */
diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h
index df4a347..9e36775 100644
--- a/libsoup/soup-logger.h
+++ b/libsoup/soup-logger.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_LOGGER_H
-#define SOUP_LOGGER_H 1
+#ifndef __SOUP_LOGGER_H__
+#define __SOUP_LOGGER_H__ 1
#include <libsoup/soup-types.h>
@@ -89,4 +89,4 @@ void soup_logger_set_printer (SoupLogger *logger,
G_END_DECLS
-#endif /* SOUP_LOGGER_H */
+#endif /* __SOUP_LOGGER_H__ */
diff --git a/libsoup/soup-message-body.c b/libsoup/soup-message-body.c
index 50428eb..00855f1 100644
--- a/libsoup/soup-message-body.c
+++ b/libsoup/soup-message-body.c
@@ -61,7 +61,7 @@ enum {
/**
* SoupBuffer:
- * @data: (type gpointer): the data
+ * @data: (array length=length) (element-type guint8): the data
* @length: length of @data
*
* A data buffer, generally used to represent a chunk of a
@@ -135,7 +135,7 @@ soup_buffer_new_take (guchar *data, gsize length)
}
/**
- * soup_buffer_new_subbuffer:
+ * soup_buffer_new_subbuffer: (constructor)
* @parent: the parent #SoupBuffer
* @offset: offset within @parent to start at
* @length: number of bytes to copy from @parent
@@ -341,7 +341,7 @@ G_DEFINE_BOXED_TYPE (SoupBuffer, soup_buffer, soup_buffer_copy, soup_buffer_free
/**
* SoupMessageBody:
- * @data: the data
+ * @data: (array length=length) (element-type guint8): the data
* @length: length of @data
*
* A #SoupMessage request or response body.
diff --git a/libsoup/soup-message-body.h b/libsoup/soup-message-body.h
index fc6c200..42721c2 100644
--- a/libsoup/soup-message-body.h
+++ b/libsoup/soup-message-body.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_MESSAGE_BODY_H
-#define SOUP_MESSAGE_BODY_H 1
+#ifndef __SOUP_MESSAGE_BODY_H__
+#define __SOUP_MESSAGE_BODY_H__ 1
#include <libsoup/soup-types.h>
@@ -111,4 +111,4 @@ void soup_message_body_free (SoupMessageBody *body);
G_END_DECLS
-#endif /* SOUP_MESSAGE_BODY_H */
+#endif /* __SOUP_MESSAGE_BODY_H__ */
diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
index a180c6e..3f115e1 100644
--- a/libsoup/soup-message-headers.c
+++ b/libsoup/soup-message-headers.c
@@ -1087,7 +1087,7 @@ soup_message_headers_get_ranges (SoupMessageHeaders *hdrs,
/**
* soup_message_headers_free_ranges:
* @hdrs: a #SoupMessageHeaders
- * @ranges: an array of #SoupRange
+ * @ranges: (array): an array of #SoupRange
*
* Frees the array of ranges returned from soup_message_headers_get_ranges().
*
diff --git a/libsoup/soup-message-headers.h b/libsoup/soup-message-headers.h
index 829e352..f430c97 100644
--- a/libsoup/soup-message-headers.h
+++ b/libsoup/soup-message-headers.h
@@ -3,8 +3,8 @@
* Copyright (C) 2005 Novell, Inc.
*/
-#ifndef SOUP_MESSAGE_HEADERS_H
-#define SOUP_MESSAGE_HEADERS_H 1
+#ifndef __SOUP_MESSAGE_HEADERS_H__
+#define __SOUP_MESSAGE_HEADERS_H__ 1
#include <libsoup/soup-types.h>
@@ -178,4 +178,4 @@ void soup_message_headers_set_content_disposition (SoupMessageHeaders *hdrs
G_END_DECLS
-#endif /* SOUP_MESSAGE_HEADERS_H */
+#endif /* __SOUP_MESSAGE_HEADERS_H__ */
diff --git a/libsoup/soup-message-private.h b/libsoup/soup-message-private.h
index 71adac7..2f3d58a 100644
--- a/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_MESSAGE_PRIVATE_H
-#define SOUP_MESSAGE_PRIVATE_H 1
+#ifndef __SOUP_MESSAGE_PRIVATE_H__
+#define __SOUP_MESSAGE_PRIVATE_H__ 1
#include "soup-message.h"
#include "soup-auth.h"
@@ -161,4 +161,4 @@ SoupConnection *soup_message_get_connection (SoupMessage *msg);
void soup_message_set_connection (SoupMessage *msg,
SoupConnection *conn);
-#endif /* SOUP_MESSAGE_PRIVATE_H */
+#endif /* __SOUP_MESSAGE_PRIVATE_H__ */
diff --git a/libsoup/soup-message-queue.h b/libsoup/soup-message-queue.h
index 275ea38..2b33a45 100644
--- a/libsoup/soup-message-queue.h
+++ b/libsoup/soup-message-queue.h
@@ -4,8 +4,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_MESSAGE_QUEUE_H
-#define SOUP_MESSAGE_QUEUE_H 1
+#ifndef __SOUP_MESSAGE_QUEUE_H__
+#define __SOUP_MESSAGE_QUEUE_H__ 1
#include "soup-connection.h"
#include "soup-message.h"
@@ -86,4 +86,4 @@ void soup_message_queue_item_unref (SoupMessageQueueItem *item);
G_END_DECLS
-#endif /* SOUP_MESSAGE_QUEUE_H */
+#endif /* __SOUP_MESSAGE_QUEUE_H__ */
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index cab2bad..9377896 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_MESSAGE_H
-#define SOUP_MESSAGE_H 1
+#ifndef __SOUP_MESSAGE_H__
+#define __SOUP_MESSAGE_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-message-body.h>
@@ -256,4 +256,4 @@ void soup_message_finished (SoupMessage *msg);
G_END_DECLS
-#endif /*SOUP_MESSAGE_H*/
+#endif /* __SOUP_MESSAGE_H__ */
diff --git a/libsoup/soup-method.h b/libsoup/soup-method.h
index cec59e3..a5ef9fd 100644
--- a/libsoup/soup-method.h
+++ b/libsoup/soup-method.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_METHOD_H
-#define SOUP_METHOD_H 1
+#ifndef __SOUP_METHOD_H__
+#define __SOUP_METHOD_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-misc.h>
@@ -77,4 +77,4 @@ SOUP_VAR gpointer _SOUP_METHOD_UNLOCK;
G_END_DECLS
-#endif /* SOUP_METHOD_H */
+#endif /* __SOUP_METHOD_H__ */
diff --git a/libsoup/soup-misc-private.h b/libsoup/soup-misc-private.h
index 7fe31a1..d8416f2 100644
--- a/libsoup/soup-misc-private.h
+++ b/libsoup/soup-misc-private.h
@@ -4,8 +4,8 @@
* Copyright 2011 Red Hat, Inc.
*/
-#ifndef SOUP_MISC_PRIVATE_H
-#define SOUP_MISC_PRIVATE_H 1
+#ifndef __SOUP_MISC_PRIVATE_H__
+#define __SOUP_MISC_PRIVATE_H__ 1
#include "soup-message-headers.h"
@@ -46,4 +46,4 @@ SoupAddress *soup_address_new_from_gsockaddr (GSocketAddress *addr);
gboolean soup_host_matches_host (const gchar *host,
const gchar *compare_with);
-#endif /* SOUP_MISC_PRIVATE_H */
+#endif /* __SOUP_MISC_PRIVATE_H__ */
diff --git a/libsoup/soup-misc.c b/libsoup/soup-misc.c
index c583d90..a1ac780 100644
--- a/libsoup/soup-misc.c
+++ b/libsoup/soup-misc.c
@@ -63,12 +63,12 @@ soup_str_case_equal (gconstpointer v1,
}
/**
- * soup_add_io_watch: (skip)
+ * soup_add_io_watch:
* @async_context: (allow-none): the #GMainContext to dispatch the I/O
* watch in, or %NULL for the default context
* @chan: the #GIOChannel to watch
* @condition: the condition to watch for
- * @function: the callback to invoke when @condition occurs
+ * @function: (scope async): the callback to invoke when @condition occurs
* @data: user data to pass to @function
*
* Adds an I/O watch as with g_io_add_watch(), but using the given
@@ -90,10 +90,10 @@ soup_add_io_watch (GMainContext *async_context,
}
/**
- * soup_add_idle: (skip)
+ * soup_add_idle:
* @async_context: (allow-none): the #GMainContext to dispatch the I/O
* watch in, or %NULL for the default context
- * @function: the callback to invoke at idle time
+ * @function: (scope async): the callback to invoke at idle time
* @data: user data to pass to @function
*
* Adds an idle event as with g_idle_add(), but using the given
@@ -132,10 +132,10 @@ soup_add_completion_reffed (GMainContext *async_context,
}
/**
- * soup_add_completion: (skip)
+ * soup_add_completion:
* @async_context: (allow-none): the #GMainContext to dispatch the I/O
* watch in, or %NULL for the default context
- * @function: the callback to invoke
+ * @function: (scope async): the callback to invoke
* @data: user data to pass to @function
*
* Adds @function to be executed from inside @async_context with the
@@ -159,11 +159,11 @@ soup_add_completion (GMainContext *async_context,
}
/**
- * soup_add_timeout: (skip)
+ * soup_add_timeout:
* @async_context: (allow-none): the #GMainContext to dispatch the I/O
* watch in, or %NULL for the default context
* @interval: the timeout interval, in milliseconds
- * @function: the callback to invoke at timeout time
+ * @function: (scope async): the callback to invoke at timeout time
* @data: user data to pass to @function
*
* Adds a timeout as with g_timeout_add(), but using the given
diff --git a/libsoup/soup-misc.h b/libsoup/soup-misc.h
index ecb09a8..fe66b28 100644
--- a/libsoup/soup-misc.h
+++ b/libsoup/soup-misc.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_MISC_H
-#define SOUP_MISC_H 1
+#ifndef __SOUP_MISC_H__
+#define __SOUP_MISC_H__ 1
#include <libsoup/soup-types.h>
@@ -74,4 +74,4 @@ typedef enum {
G_END_DECLS
-#endif /* SOUP_MISC_H */
+#endif /* __SOUP_MISC_H__ */
diff --git a/libsoup/soup-multipart-input-stream.h b/libsoup/soup-multipart-input-stream.h
index 8b73506..bbbac66 100644
--- a/libsoup/soup-multipart-input-stream.h
+++ b/libsoup/soup-multipart-input-stream.h
@@ -3,8 +3,8 @@
* Copyright (C) 2012 Collabora Ltd.
*/
-#ifndef SOUP_MULTIPART_INPUT_STREAM_H
-#define SOUP_MULTIPART_INPUT_STREAM_H 1
+#ifndef __SOUP_MULTIPART_INPUT_STREAM_H__
+#define __SOUP_MULTIPART_INPUT_STREAM_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-message-headers.h>
@@ -63,4 +63,4 @@ SoupMessageHeaders *soup_multipart_input_stream_get_headers (SoupMult
G_END_DECLS
-#endif /* SOUP_MULTIPART_INPUT_STREAM_H */
+#endif /* __SOUP_MULTIPART_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-multipart.h b/libsoup/soup-multipart.h
index ddd1b36..aa790cb 100644
--- a/libsoup/soup-multipart.h
+++ b/libsoup/soup-multipart.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_MULTIPART_H
-#define SOUP_MULTIPART_H 1
+#ifndef __SOUP_MULTIPART_H__
+#define __SOUP_MULTIPART_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-message-body.h>
@@ -58,4 +58,4 @@ void soup_multipart_free (SoupMultipart *multipart);
G_END_DECLS
-#endif /* SOUP_MULTIPART_H */
+#endif /* __SOUP_MULTIPART_H__ */
diff --git a/libsoup/soup-password-manager-gnome.h b/libsoup/soup-password-manager-gnome.h
index 290e3ec..4a937c7 100644
--- a/libsoup/soup-password-manager-gnome.h
+++ b/libsoup/soup-password-manager-gnome.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_PASSWORD_MANAGER_GNOME_H
-#define SOUP_PASSWORD_MANAGER_GNOME_H 1
+#ifndef __SOUP_PASSWORD_MANAGER_GNOME_H__
+#define __SOUP_PASSWORD_MANAGER_GNOME_H__ 1
#include "soup-password-manager.h"
#include "soup-gnome-features.h"
@@ -25,4 +25,4 @@ typedef struct {
} SoupPasswordManagerGNOMEClass;
-#endif /* SOUP_PASSWORD_MANAGER_GNOME_H */
+#endif /* __SOUP_PASSWORD_MANAGER_GNOME_H__ */
diff --git a/libsoup/soup-password-manager.h b/libsoup/soup-password-manager.h
index aa5faf5..343f53c 100644
--- a/libsoup/soup-password-manager.h
+++ b/libsoup/soup-password-manager.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_PASSWORD_MANAGER_H
-#define SOUP_PASSWORD_MANAGER_H 1
+#ifndef __SOUP_PASSWORD_MANAGER_H__
+#define __SOUP_PASSWORD_MANAGER_H__ 1
#include <libsoup/soup-types.h>
@@ -61,4 +61,4 @@ void soup_password_manager_get_passwords_sync (SoupPasswordManager *password_
SoupAuth *auth,
GCancellable *cancellable);
-#endif /* SOUP_PASSWORD_MANAGER_H */
+#endif /* __SOUP_PASSWORD_MANAGER_H__ */
diff --git a/libsoup/soup-path-map.h b/libsoup/soup-path-map.h
index f5a8ba8..6b17bed 100644
--- a/libsoup/soup-path-map.h
+++ b/libsoup/soup-path-map.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Novell, Inc.
*/
-#ifndef SOUP_PATH_MAP_H
-#define SOUP_PATH_MAP_H 1
+#ifndef __SOUP_PATH_MAP_H__
+#define __SOUP_PATH_MAP_H__ 1
#include <libsoup/soup-types.h>
@@ -23,4 +23,4 @@ gpointer soup_path_map_lookup (SoupPathMap *map,
const char *path);
-#endif /* SOUP_PATH_MAP_H */
+#endif /* __SOUP_PATH_MAP_H__ */
diff --git a/libsoup/soup-portability.h b/libsoup/soup-portability.h
index 1814efb..a52ad4a 100644
--- a/libsoup/soup-portability.h
+++ b/libsoup/soup-portability.h
@@ -3,8 +3,8 @@
* Copyright (C) 2005, Novell, Inc.
*/
-#ifndef SOUP_PORTABILITY_H
-#define SOUP_PORTABILITY_H
+#ifndef __SOUP_PORTABILITY_H__
+#define __SOUP_PORTABILITY_H__
#include <libsoup/soup-types.h>
@@ -23,4 +23,4 @@
#endif
-#endif /* SOUP_PORTABILITY_H */
+#endif /* __SOUP_PORTABILITY_H__ */
diff --git a/libsoup/soup-proxy-resolver-default.h b/libsoup/soup-proxy-resolver-default.h
index 4bc6c74..a140ff6 100644
--- a/libsoup/soup-proxy-resolver-default.h
+++ b/libsoup/soup-proxy-resolver-default.h
@@ -3,8 +3,8 @@
* Copyright (C) 2011 Collabora Ltd.
*/
-#ifndef SOUP_PROXY_RESOLVER_DEFAULT_H
-#define SOUP_PROXY_RESOLVER_DEFAULT_H 1
+#ifndef __SOUP_PROXY_RESOLVER_DEFAULT_H__
+#define __SOUP_PROXY_RESOLVER_DEFAULT_H__ 1
#include <libsoup/soup-types.h>
@@ -28,4 +28,4 @@ SOUP_AVAILABLE_IN_2_4
GType soup_proxy_resolver_default_get_type (void);
#define SOUP_TYPE_PROXY_RESOLVER_DEFAULT (soup_proxy_resolver_default_get_type ())
-#endif /*SOUP_PROXY_RESOLVER_DEFAULT_H*/
+#endif /* __SOUP_PROXY_RESOLVER_DEFAULT_H__ */
diff --git a/libsoup/soup-proxy-resolver-gnome.h b/libsoup/soup-proxy-resolver-gnome.h
index 809e9dd..484cc1a 100644
--- a/libsoup/soup-proxy-resolver-gnome.h
+++ b/libsoup/soup-proxy-resolver-gnome.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_PROXY_RESOLVER_GNOME_H
-#define SOUP_PROXY_RESOLVER_GNOME_H 1
+#ifndef __SOUP_PROXY_RESOLVER_GNOME_H__
+#define __SOUP_PROXY_RESOLVER_GNOME_H__ 1
#include "soup-gnome-features.h"
#include "soup-proxy-resolver-default.h"
@@ -22,4 +22,4 @@
typedef SoupProxyResolverDefault SoupProxyResolverGNOME;
typedef SoupProxyResolverDefaultClass SoupProxyResolverGNOMEClass;
-#endif /*SOUP_PROXY_RESOLVER_GNOME_H*/
+#endif /* __SOUP_PROXY_RESOLVER_GNOME_H__ */
diff --git a/libsoup/soup-proxy-resolver-wrapper.h b/libsoup/soup-proxy-resolver-wrapper.h
index d16b57c..102b6c9 100644
--- a/libsoup/soup-proxy-resolver-wrapper.h
+++ b/libsoup/soup-proxy-resolver-wrapper.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_PROXY_RESOLVER_WRAPPER_H
-#define SOUP_PROXY_RESOLVER_WRAPPER_H 1
+#ifndef __SOUP_PROXY_RESOLVER_WRAPPER_H__
+#define __SOUP_PROXY_RESOLVER_WRAPPER_H__ 1
#include "soup-proxy-uri-resolver.h"
#include "soup-uri.h"
@@ -31,4 +31,4 @@ GType soup_proxy_resolver_wrapper_get_type (void);
GProxyResolver *soup_proxy_resolver_wrapper_new (SoupProxyURIResolver *soup_resolver);
-#endif /* SOUP_PROXY_RESOLVER_WRAPPER_H */
+#endif /* __SOUP_PROXY_RESOLVER_WRAPPER_H__ */
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__ */
diff --git a/libsoup/soup-proxy-uri-resolver.h b/libsoup/soup-proxy-uri-resolver.h
index e203125..fa78ea6 100644
--- a/libsoup/soup-proxy-uri-resolver.h
+++ b/libsoup/soup-proxy-uri-resolver.h
@@ -3,8 +3,8 @@
* Copyright (C) 2009 Red Hat, Inc.
*/
-#ifndef SOUP_PROXY_URI_RESOLVER_H
-#define SOUP_PROXY_URI_RESOLVER_H 1
+#ifndef __SOUP_PROXY_URI_RESOLVER_H__
+#define __SOUP_PROXY_URI_RESOLVER_H__ 1
#include <libsoup/soup-proxy-resolver.h>
@@ -64,4 +64,4 @@ guint soup_proxy_uri_resolver_get_proxy_uri_sync (SoupProxyURIResolver *proxy_
G_END_DECLS
-#endif /*SOUP_PROXY_URI_RESOLVER_H*/
+#endif /* __SOUP_PROXY_URI_RESOLVER_H__ */
diff --git a/libsoup/soup-request-data.h b/libsoup/soup-request-data.h
index 929c590..154a904 100644
--- a/libsoup/soup-request-data.h
+++ b/libsoup/soup-request-data.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_REQUEST_DATA_H
-#define SOUP_REQUEST_DATA_H 1
+#ifndef __SOUP_REQUEST_DATA_H__
+#define __SOUP_REQUEST_DATA_H__ 1
#include "soup-request.h"
@@ -50,4 +50,4 @@ GType soup_request_data_get_type (void);
G_END_DECLS
-#endif /* SOUP_REQUEST_DATA_H */
+#endif /* __SOUP_REQUEST_DATA_H__ */
diff --git a/libsoup/soup-request-file.h b/libsoup/soup-request-file.h
index df2cbab..cc70c9f 100644
--- a/libsoup/soup-request-file.h
+++ b/libsoup/soup-request-file.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_REQUEST_FILE_H
-#define SOUP_REQUEST_FILE_H 1
+#ifndef __SOUP_REQUEST_FILE_H__
+#define __SOUP_REQUEST_FILE_H__ 1
#include "soup-request.h"
@@ -53,4 +53,4 @@ GFile *soup_request_file_get_file (SoupRequestFile *file);
G_END_DECLS
-#endif /* SOUP_REQUEST_FILE_H */
+#endif /* __SOUP_REQUEST_FILE_H__ */
diff --git a/libsoup/soup-request-http.h b/libsoup/soup-request-http.h
index 271a805..3a32feb 100644
--- a/libsoup/soup-request-http.h
+++ b/libsoup/soup-request-http.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_REQUEST_HTTP_H
-#define SOUP_REQUEST_HTTP_H 1
+#ifndef __SOUP_REQUEST_HTTP_H__
+#define __SOUP_REQUEST_HTTP_H__ 1
#include "soup-request.h"
@@ -53,4 +53,4 @@ SoupMessage *soup_request_http_get_message (SoupRequestHTTP *http);
G_END_DECLS
-#endif /* SOUP_REQUEST_HTTP_H */
+#endif /* __SOUP_REQUEST_HTTP_H__ */
diff --git a/libsoup/soup-request.h b/libsoup/soup-request.h
index 84ad6d6..cc0eec0 100644
--- a/libsoup/soup-request.h
+++ b/libsoup/soup-request.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_REQUEST_H
-#define SOUP_REQUEST_H 1
+#ifndef __SOUP_REQUEST_H__
+#define __SOUP_REQUEST_H__ 1
#include <gio/gio.h>
@@ -100,4 +100,4 @@ const char *soup_request_get_content_type (SoupRequest *request);
G_END_DECLS
-#endif /* SOUP_REQUEST_H */
+#endif /* __SOUP_REQUEST_H__ */
diff --git a/libsoup/soup-requester.h b/libsoup/soup-requester.h
index 0635513..b0701b1 100644
--- a/libsoup/soup-requester.h
+++ b/libsoup/soup-requester.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SOUP_REQUESTER_H
-#define SOUP_REQUESTER_H 1
+#ifndef __SOUP_REQUESTER_H__
+#define __SOUP_REQUESTER_H__ 1
#ifdef LIBSOUP_USE_UNSTABLE_REQUEST_API
@@ -81,4 +81,4 @@ G_END_DECLS
#endif /* LIBSOUP_USE_UNSTABLE_REQUEST_API */
-#endif /* SOUP_REQUESTER_H */
+#endif /* __SOUP_REQUESTER_H__ */
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 47ebac3..548a9db 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -783,7 +783,7 @@ soup_server_class_init (SoupServerClass *server_class)
G_TYPE_TLS_CERTIFICATE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
- * SoupServer:async-context:
+ * SoupServer:async-context: (type GMainContext)
*
* The server's #GMainContext, if you are using the old API.
* Servers created using soup_server_listen() will listen on
diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
index 6329487..f04e9eb 100644
--- a/libsoup/soup-server.h
+++ b/libsoup/soup-server.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_SERVER_H
-#define SOUP_SERVER_H 1
+#ifndef __SOUP_SERVER_H__
+#define __SOUP_SERVER_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-uri.h>
@@ -228,4 +228,4 @@ SoupSocket *soup_client_context_get_socket (SoupClientContext *client);
G_END_DECLS
-#endif /* SOUP_SERVER_H */
+#endif /* __SOUP_SERVER_H__ */
diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index d5a450e..32803c8 100644
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_SESSION_ASYNC_H
-#define SOUP_SESSION_ASYNC_H 1
+#ifndef __SOUP_SESSION_ASYNC_H__
+#define __SOUP_SESSION_ASYNC_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-session.h>
@@ -57,4 +57,4 @@ SoupSession *soup_session_async_new_with_options (const char *optname1,
G_END_DECLS
-#endif /* SOUP_SESSION_ASYNC_H */
+#endif /* __SOUP_SESSION_ASYNC_H__ */
diff --git a/libsoup/soup-session-feature.h b/libsoup/soup-session-feature.h
index 962c8e1..885b8ee 100644
--- a/libsoup/soup-session-feature.h
+++ b/libsoup/soup-session-feature.h
@@ -3,8 +3,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#ifndef SOUP_SESSION_FEATURE_H
-#define SOUP_SESSION_FEATURE_H 1
+#ifndef __SOUP_SESSION_FEATURE_H__
+#define __SOUP_SESSION_FEATURE_H__ 1
#include <libsoup/soup-types.h>
diff --git a/libsoup/soup-session-private.h b/libsoup/soup-session-private.h
index dc4d300..6247856 100644
--- a/libsoup/soup-session-private.h
+++ b/libsoup/soup-session-private.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_SESSION_PRIVATE_H
-#define SOUP_SESSION_PRIVATE_H 1
+#ifndef __SOUP_SESSION_PRIVATE_H__
+#define __SOUP_SESSION_PRIVATE_H__ 1
#include "soup-session.h"
#include "soup-message-private.h"
@@ -45,4 +45,4 @@ void soup_session_process_queue_item (SoupSession *s
G_END_DECLS
-#endif /* SOUP_SESSION_PRIVATE_H */
+#endif /* __SOUP_SESSION_PRIVATE_H__ */
diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index 56c340c..691a97f 100644
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_SESSION_SYNC_H
-#define SOUP_SESSION_SYNC_H 1
+#ifndef __SOUP_SESSION_SYNC_H__
+#define __SOUP_SESSION_SYNC_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-session.h>
@@ -57,4 +57,4 @@ SoupSession *soup_session_sync_new_with_options (const char *optname1,
G_END_DECLS
-#endif /* SOUP_SESSION_SYNC_H */
+#endif /* __SOUP_SESSION_SYNC_H__ */
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index ae340b9..d2d601e 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -3480,7 +3480,7 @@ soup_session_class_init (SoupSessionClass *session_class)
TRUE,
G_PARAM_READWRITE));
/**
- * SoupSession:async-context:
+ * SoupSession:async-context: (type GMainContext)
*
* The #GMainContext that miscellaneous session-related
* asynchronous callbacks are invoked on. (Eg, setting
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 24e90b2..46e4e15 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_SESSION_H
-#define SOUP_SESSION_H 1
+#ifndef __SOUP_SESSION_H__
+#define __SOUP_SESSION_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-address.h>
@@ -254,4 +254,4 @@ GIOStream *soup_session_connect_finish (SoupSession *sessi
G_END_DECLS
-#endif /* SOUP_SESSION_H */
+#endif /* __SOUP_SESSION_H__ */
diff --git a/libsoup/soup-socket-private.h b/libsoup/soup-socket-private.h
index 8677884..582d612 100644
--- a/libsoup/soup-socket-private.h
+++ b/libsoup/soup-socket-private.h
@@ -3,8 +3,8 @@
* Copyright 2011-2014 Red Hat, Inc.
*/
-#ifndef SOUP_SOCKET_PRIVATE_H
-#define SOUP_SOCKET_PRIVATE_H 1
+#ifndef __SOUP_SOCKET_PRIVATE_H__
+#define __SOUP_SOCKET_PRIVATE_H__ 1
#include "soup-socket.h"
@@ -88,4 +88,4 @@ void soup_socket_properties_unref (SoupSocketProperties *props)
void soup_socket_properties_push_async_context (SoupSocketProperties *props);
void soup_socket_properties_pop_async_context (SoupSocketProperties *props);
-#endif /* SOUP_SOCKET_PRIVATE_H */
+#endif /* __SOUP_SOCKET_PRIVATE_H__ */
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index 5363dc7..9434adc 100644
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -657,10 +657,15 @@ soup_socket_class_init (SoupSocketClass *socket_class)
* Alias for the #SoupSocket:ssl-creds property.
* (SSL credential information.)
**/
- /* For historical reasons, there's only a single property
+ /**
+ * SoupSocket:ssl-creds: (type GObject)
+ *
+ * SSL credential information
+ *
+ * For historical reasons, there's only a single property
* here, which is a GTlsDatabase for client sockets, and
* a GTlsCertificate for server sockets. Whee!
- */
+ **/
g_object_class_install_property (
object_class, PROP_SSL_CREDENTIALS,
g_param_spec_pointer (SOUP_SOCKET_SSL_CREDENTIALS,
@@ -705,6 +710,12 @@ soup_socket_class_init (SoupSocketClass *socket_class)
FALSE,
G_PARAM_READABLE));
/**
+ * SoupSocket:async-context: (type GMainContext)
+ *
+ * If #SoupSocket:use-thread-context is %FALSE, this context
+ * will also be used for asynchronous HTTP I/O.
+ */
+ /**
* SOUP_SOCKET_ASYNC_CONTEXT:
*
* Alias for the #SoupSocket:async-context property. (The
@@ -1888,10 +1899,11 @@ out:
* @buffer: (array length=len) (element-type guint8): buffer to read
* into
* @len: size of @buffer in bytes
- * @boundary: boundary to read until
+ * @boundary: (array length=boundary_len) (element-type guint8): boundary to
+ * read until
* @boundary_len: length of @boundary in bytes
* @nread: (out): on return, the number of bytes read into @buffer
- * @got_boundary: on return, whether or not the data in @buffer
+ * @got_boundary: (out): on return, whether or not the data in @buffer
* ends with the boundary string
* @cancellable: a #GCancellable, or %NULL
* @error: error pointer
diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index 993d1c6..98d0693 100644
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_SOCKET_H
-#define SOUP_SOCKET_H 1
+#ifndef __SOUP_SOCKET_H__
+#define __SOUP_SOCKET_H__ 1
#include <libsoup/soup-types.h>
@@ -133,4 +133,4 @@ SoupSocketIOStatus soup_socket_write (SoupSocket *sock,
G_END_DECLS
-#endif /* SOUP_SOCKET_H */
+#endif /* __SOUP_SOCKET_H__ */
diff --git a/libsoup/soup-status.h b/libsoup/soup-status.h
index 28d481d..38beab4 100644
--- a/libsoup/soup-status.h
+++ b/libsoup/soup-status.h
@@ -5,8 +5,8 @@
* Copyright (C) 2001-2003, Ximian, Inc.
*/
-#ifndef SOUP_STATUS_H
-#define SOUP_STATUS_H 1
+#ifndef __SOUP_STATUS_H__
+#define __SOUP_STATUS_H__ 1
#include <libsoup/soup-types.h>
@@ -182,4 +182,4 @@ typedef enum {
G_END_DECLS
-#endif /* SOUP_STATUS_H */
+#endif /* __SOUP_STATUS_H__ */
diff --git a/libsoup/soup-tld-private.h b/libsoup/soup-tld-private.h
index 2017951..0a8123c 100644
--- a/libsoup/soup-tld-private.h
+++ b/libsoup/soup-tld-private.h
@@ -5,8 +5,8 @@
* Copyright (C) 2012 Igalia, S.L.
*/
-#ifndef SOUP_TLD_PRIVATE_H
-#define SOUP_TLD_PRIVATE_H 1
+#ifndef __SOUP_TLD_PRIVATE_H__
+#define __SOUP_TLD_PRIVATE_H__ 1
G_BEGIN_DECLS
@@ -23,4 +23,4 @@ typedef struct {
G_END_DECLS
-#endif /* SOUP_TLD_PRIVATE_H */
+#endif /* __SOUP_TLD_PRIVATE_H__ */
diff --git a/libsoup/soup-types.h b/libsoup/soup-types.h
index e020de7..6e20e1f 100644
--- a/libsoup/soup-types.h
+++ b/libsoup/soup-types.h
@@ -3,8 +3,8 @@
* Copyright (C) 2003, Ximian, Inc.
*/
-#ifndef SOUP_TYPES_H
-#define SOUP_TYPES_H 1
+#ifndef __SOUP_TYPES_H__
+#define __SOUP_TYPES_H__ 1
#include <gio/gio.h>
diff --git a/libsoup/soup-uri.c b/libsoup/soup-uri.c
index be778d6..caac74e 100644
--- a/libsoup/soup-uri.c
+++ b/libsoup/soup-uri.c
@@ -224,13 +224,13 @@ soup_scheme_default_port (const char *scheme)
}
/**
- * soup_uri_new_with_base:
+ * soup_uri_new_with_base: (constructor)
* @base: a base URI
* @uri_string: the URI
*
* Parses @uri_string relative to @base.
*
- * Return value: a parsed #SoupURI.
+ * Returns: a parsed #SoupURI.
**/
SoupURI *
soup_uri_new_with_base (SoupURI *base, const char *uri_string)
diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h
index b9360c6..8015e4f 100644
--- a/libsoup/soup-uri.h
+++ b/libsoup/soup-uri.h
@@ -5,8 +5,8 @@
*/
-#ifndef SOUP_URI_H
-#define SOUP_URI_H 1
+#ifndef __SOUP_URI_H__
+#define __SOUP_URI_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-misc.h>
@@ -139,4 +139,4 @@ gboolean soup_uri_host_equal (gconstpointer v1,
G_END_DECLS
-#endif /*SOUP_URI_H*/
+#endif /* __SOUP_URI_H__ */
diff --git a/libsoup/soup-value-utils.h b/libsoup/soup-value-utils.h
index 7910bef..9fa19c3 100644
--- a/libsoup/soup-value-utils.h
+++ b/libsoup/soup-value-utils.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Red Hat, Inc.
*/
-#ifndef SOUP_VALUE_UTILS_H
-#define SOUP_VALUE_UTILS_H 1
+#ifndef __SOUP_VALUE_UTILS_H__
+#define __SOUP_VALUE_UTILS_H__ 1
#include <libsoup/soup-types.h>
#include <gobject/gvaluecollector.h>
@@ -111,4 +111,4 @@ GType soup_byte_array_get_type (void);
G_END_DECLS
-#endif /* SOUP_VALUE_UTILS_H */
+#endif /* __SOUP_VALUE_UTILS_H__ */
diff --git a/libsoup/soup-version.c b/libsoup/soup-version.c
index 99c3b53..e25c0f1 100644
--- a/libsoup/soup-version.c
+++ b/libsoup/soup-version.c
@@ -148,7 +148,7 @@ soup_check_version (guint major,
}
/**
- * SOUP_VERSION_MIN_REQUIRED:
+ * SOUP_VERSION_MIN_REQUIRED: (skip)
*
* A macro that should be defined by the user prior to including
* libsoup.h. The definition should be one of the predefined libsoup
@@ -166,7 +166,7 @@ soup_check_version (guint major,
*/
/**
- * SOUP_VERSION_MAX_ALLOWED:
+ * SOUP_VERSION_MAX_ALLOWED: (skip)
*
* A macro that should be defined by the user prior to including
* libsoup.h. The definition should be one of the predefined libsoup
diff --git a/libsoup/soup-version.h.in b/libsoup/soup-version.h.in
index 0af245b..0ec2b9e 100644
--- a/libsoup/soup-version.h.in
+++ b/libsoup/soup-version.h.in
@@ -5,8 +5,8 @@
* Copyright (C) 2012 Igalia S.L.
*/
-#ifndef SOUP_VERSION_H
-#define SOUP_VERSION_H
+#ifndef __SOUP_VERSION_H__
+#define __SOUP_VERSION_H__
#include <glib.h>
@@ -390,4 +390,4 @@ gboolean soup_check_version (guint major,
G_END_DECLS
-#endif /* SOUP_VERSION_H */
+#endif /* __SOUP_VERSION_H__ */
diff --git a/libsoup/soup-xmlrpc-old.h b/libsoup/soup-xmlrpc-old.h
index 1f486ef..cf446f0 100644
--- a/libsoup/soup-xmlrpc-old.h
+++ b/libsoup/soup-xmlrpc-old.h
@@ -3,8 +3,8 @@
* Copyright (C) 2007 Red Hat, Inc.
*/
-#ifndef SOUP_XMLRPC_OLD_H
-#define SOUP_XMLRPC_OLD_H 1
+#ifndef __SOUP_XMLRPC_OLD_H__
+#define __SOUP_XMLRPC_OLD_H__ 1
#include <libsoup/soup-types.h>
@@ -65,4 +65,4 @@ void soup_xmlrpc_set_fault (SoupMessage *msg,
G_END_DECLS
-#endif /* SOUP_XMLRPC_OLD_H */
+#endif /* __SOUP_XMLRPC_OLD_H__ */
diff --git a/libsoup/soup-xmlrpc.h b/libsoup/soup-xmlrpc.h
index 1c4634f..a424fde 100644
--- a/libsoup/soup-xmlrpc.h
+++ b/libsoup/soup-xmlrpc.h
@@ -3,8 +3,8 @@
* Copyright 2015 - Collabora Ltd.
*/
-#ifndef SOUP_XMLRPC_H
-#define SOUP_XMLRPC_H 1
+#ifndef __SOUP_XMLRPC_H__
+#define __SOUP_XMLRPC_H__ 1
#include <libsoup/soup-types.h>
#include <libsoup/soup-xmlrpc-old.h>
@@ -94,4 +94,4 @@ typedef enum {
G_END_DECLS
-#endif /* SOUP_XMLRPC_H */
+#endif /* __SOUP_XMLRPC_H__ */
diff --git a/libsoup/soup.h b/libsoup/soup.h
index 6bedb62..0fb6286 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -3,8 +3,8 @@
* Copyright (C) 2000-2003, Ximian, Inc.
*/
-#ifndef SOUP_H
-#define SOUP_H 1
+#ifndef __SOUP_H__
+#define __SOUP_H__ 1
#ifdef __cplusplus
extern "C" {
@@ -65,4 +65,4 @@ extern "C" {
}
#endif
-#endif /* SOUP_H */
+#endif /* __SOUP_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
