diff options
55 files changed, 332 insertions, 897 deletions
diff --git a/docs/reference/client-howto.xml b/docs/reference/client-howto.xml index 2426a249..d9c558ae 100644 --- a/docs/reference/client-howto.xml +++ b/docs/reference/client-howto.xml @@ -41,7 +41,7 @@ you can specify various additional options: <variablelist> <varlistentry> - <term><link linkend="SOUP-SESSION-MAX-CONNS:CAPS"><literal>SOUP_SESSION_MAX_CONNS</literal></link></term> + <term><link linkend="SoupSession:max-conns"><literal>"max-conns"</literal></link></term> <listitem><para> Allows you to set the maximum total number of connections the session will have open at one time. (Once it reaches @@ -51,7 +51,7 @@ you can specify various additional options: </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SESSION-MAX-CONNS-PER-HOST:CAPS"><literal>SOUP_SESSION_MAX_CONNS_PER_HOST</literal></link></term> + <term><link linkend="SoupSession:max-conns-per-host"><literal>"max-conns-per-host"</literal></link></term> <listitem><para> Allows you to set the maximum total number of connections the session will have open <emphasis>to a single @@ -59,27 +59,27 @@ you can specify various additional options: </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SESSION-USER-AGENT:CAPS"><literal>SOUP_SESSION_USER_AGENT</literal></link></term> + <term><link linkend="SoupSession:user-agent"><literal>"user-agent"</literal></link></term> <listitem><para> Allows you to set a User-Agent string that will be sent on all outgoing requests. </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SESSION-ACCEPT-LANGUAGE:CAPS"><literal>SOUP_SESSION_ACCEPT_LANGUAGE</literal></link> - and <link linkend="SOUP-SESSION-ACCEPT-LANGUAGE-AUTO:CAPS"><literal>SOUP_SESSION_ACCEPT_LANGUAGE_AUTO</literal></link></term> + <term><link linkend="SoupSession:accept-language"><literal>"accept-language"</literal></link> + and <link linkend="SoupSession:accept-language-auto"><literal>"accept-language-auto"</literal></link></term> <listitem><para> Allow you to set an Accept-Language header on all outgoing - requests. <literal>SOUP_SESSION_ACCEPT_LANGUAGE</literal> + requests. <literal>"accept-language"</literal> takes a list of language tags to use, while - <literal>SOUP_SESSION_ACCEPT_LANGUAGE_AUTO</literal> + <literal>"accept-language-auto"</literal> automatically generates the list from the user's locale settings. </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SESSION-HTTP-ALIASES:CAPS"><literal>SOUP_SESSION_HTTP_ALIASES</literal></link> - and <link linkend="SOUP-SESSION-HTTPS-ALIASES:CAPS"><literal>SOUP_SESSION_HTTPS_ALIASES</literal></link></term> + <term><link linkend="SoupSession:http-aliases"><literal>"http-aliases"</literal></link> + and <link linkend="SoupSession:https-aliases"><literal>"https-aliases"</literal></link></term> <listitem><para> Allow you to tell the session to recognize additional URI schemes as aliases for "<literal>http</literal>" or @@ -91,10 +91,10 @@ you can specify various additional options: </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SESSION-PROXY-RESOLVER:CAPS"><literal>SOUP_SESSION_PROXY_RESOLVER</literal></link></term> + <term><link linkend="SoupSession:proxy-resolver"><literal>"proxy-resolver"</literal></link></term> <listitem> <para> - <link linkend="SOUP-SESSION-PROXY-RESOLVER:CAPS"><literal>SOUP_SESSION_PROXY_RESOLVER</literal></link> + <link linkend="SoupSession:proxy-resolver"><literal>"proxy-resolver"</literal></link> specifies a <link linkend="GProxyResolver"><type>GProxyResolver</type></link> to use to determine the HTTP proxies to use. By default, @@ -105,7 +105,7 @@ you can specify various additional options: </listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SESSION-ADD-FEATURE:CAPS"><literal>SOUP_SESSION_ADD_FEATURE</literal></link> and <link linkend="SOUP-SESSION-ADD-FEATURE-BY-TYPE:CAPS"><literal>SOUP_SESSION_ADD_FEATURE_BY_TYPE</literal></link></term> + <term><link linkend="SoupSession:add-feature"><literal>"add-feature"</literal></link> and <link linkend="SOUP-SESSION-ADD-FEATURE-BY-TYPE:CAPS"><literal>"add-feature-by-type"</literal></link></term> <listitem><para> These allow you to specify <link linkend="SoupSessionFeature"><type>SoupSessionFeature</type></link>s @@ -136,9 +136,9 @@ which takes no arguments. Additional session functionality is provided as <link linkend="SoupSessionFeature"><type>SoupSessionFeature</type></link>s, which can be added to a session, via the <link -linkend="SOUP-SESSION-ADD-FEATURE:CAPS"><literal>SOUP_SESSION_ADD_FEATURE</literal></link> +linkend="SoupSession:add-feature"><literal>"add-feature"</literal></link> and <link -linkend="SOUP-SESSION-ADD-FEATURE-BY-TYPE:CAPS"><literal>SOUP_SESSION_ADD_FEATURE_BY_TYPE</literal></link> +linkend="SoupSession:add-feature-by-type"><literal>"add-feature-by-type"</literal></link> options at session-construction-time, or afterward via the <link linkend="soup-session-add-feature"><function>soup_session_add_feature</function></link> and <link @@ -204,7 +204,7 @@ application might do something like the following: <informalexample><programlisting> session = soup_session_new_with_options ( - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_SNIFFER, + "add-feature-by-type", SOUP_TYPE_CONTENT_SNIFFER, NULL); if (debug_level) { diff --git a/docs/reference/libsoup-3.0-sections.txt b/docs/reference/libsoup-3.0-sections.txt index 3c333970..d50ec834 100644 --- a/docs/reference/libsoup-3.0-sections.txt +++ b/docs/reference/libsoup-3.0-sections.txt @@ -41,26 +41,6 @@ soup_message_get_site_for_cookies soup_message_set_site_for_cookies soup_message_get_is_top_level_navigation soup_message_set_is_top_level_navigation -<SUBSECTION> -SOUP_MESSAGE_METHOD -SOUP_MESSAGE_URI -SOUP_MESSAGE_HTTP_VERSION -SOUP_MESSAGE_FLAGS -SOUP_MESSAGE_STATUS_CODE -SOUP_MESSAGE_REASON_PHRASE -SOUP_MESSAGE_SERVER_SIDE -SOUP_MESSAGE_FIRST_PARTY -SOUP_MESSAGE_PRIORITY -SOUP_MESSAGE_REQUEST_BODY -SOUP_MESSAGE_REQUEST_BODY_DATA -SOUP_MESSAGE_REQUEST_HEADERS -SOUP_MESSAGE_RESPONSE_BODY -SOUP_MESSAGE_RESPONSE_BODY_DATA -SOUP_MESSAGE_RESPONSE_HEADERS -SOUP_MESSAGE_TLS_CERTIFICATE -SOUP_MESSAGE_TLS_ERRORS -SOUP_MESSAGE_IS_TOP_LEVEL_NAVIGATION -SOUP_MESSAGE_SITE_FOR_COOKIES <SUBSECTION Standard> SOUP_MESSAGE SOUP_IS_MESSAGE @@ -259,12 +239,6 @@ soup_server_remove_auth_domain <SUBSECTION> soup_server_pause_message soup_server_unpause_message -<SUBSECTION> -SOUP_SERVER_TLS_CERTIFICATE -SOUP_SERVER_RAW_PATHS -SOUP_SERVER_SERVER_HEADER -SOUP_SERVER_HTTP_ALIASES -SOUP_SERVER_HTTPS_ALIASES <SUBSECTION Standard> SOUP_SERVER SOUP_IS_SERVER @@ -312,8 +286,6 @@ soup_server_message_get_type <TITLE>SoupAuthDomain</TITLE> SoupAuthDomain <SUBSECTION> -soup_auth_domain_add_path -soup_auth_domain_remove_path SoupAuthDomainFilter soup_auth_domain_set_filter soup_auth_domain_get_realm @@ -325,15 +297,6 @@ soup_auth_domain_check_password soup_auth_domain_covers soup_auth_domain_accepts soup_auth_domain_challenge -<SUBSECTION> -SOUP_AUTH_DOMAIN_REALM -SOUP_AUTH_DOMAIN_PROXY -SOUP_AUTH_DOMAIN_ADD_PATH -SOUP_AUTH_DOMAIN_REMOVE_PATH -SOUP_AUTH_DOMAIN_FILTER -SOUP_AUTH_DOMAIN_FILTER_DATA -SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK -SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA <SUBSECTION Private> soup_auth_domain_try_generic_auth_callback <SUBSECTION Standard> @@ -355,9 +318,6 @@ soup_auth_domain_basic_new <SUBSECTION> SoupAuthDomainBasicAuthCallback soup_auth_domain_basic_set_auth_callback -<SUBSECTION> -SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK -SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA <SUBSECTION Standard> SOUP_AUTH_DOMAIN_BASIC SOUP_IS_AUTH_DOMAIN_BASIC @@ -378,9 +338,6 @@ soup_auth_domain_digest_new SoupAuthDomainDigestAuthCallback soup_auth_domain_digest_set_auth_callback soup_auth_domain_digest_encode_password -<SUBSECTION> -SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK -SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA <SUBSECTION Standard> SOUP_AUTH_DOMAIN_DIGEST SOUP_IS_AUTH_DOMAIN_DIGEST @@ -432,25 +389,6 @@ soup_session_get_features soup_session_get_feature soup_session_get_feature_for_message soup_session_has_feature -<SUBSECTION> -SOUP_SESSION_PROXY_RESOLVER -SOUP_SESSION_MAX_CONNS -SOUP_SESSION_MAX_CONNS_PER_HOST -SOUP_SESSION_TLS_DATABASE -SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE -SOUP_SESSION_SSL_STRICT -SOUP_SESSION_TLS_INTERACTION -SOUP_SESSION_TIMEOUT -SOUP_SESSION_IDLE_TIMEOUT -SOUP_SESSION_USER_AGENT -SOUP_SESSION_ADD_FEATURE -SOUP_SESSION_ADD_FEATURE_BY_TYPE -SOUP_SESSION_REMOVE_FEATURE_BY_TYPE -SOUP_SESSION_ACCEPT_LANGUAGE -SOUP_SESSION_ACCEPT_LANGUAGE_AUTO -SOUP_SESSION_HTTP_ALIASES -SOUP_SESSION_HTTPS_ALIASES -SOUP_SESSION_LOCAL_ADDRESS <SUBSECTION Standard> SOUP_IS_SESSION SOUP_IS_SESSION_CLASS @@ -523,12 +461,6 @@ soup_auth_is_ready soup_auth_get_authorization soup_auth_get_protection_space soup_auth_free_protection_space -<SUBSECTION> -SOUP_AUTH_SCHEME_NAME -SOUP_AUTH_REALM -SOUP_AUTH_HOST -SOUP_AUTH_IS_FOR_PROXY -SOUP_AUTH_IS_AUTHENTICATED <SUBSECTION Private> SoupAuthBasic SoupAuthDigest @@ -662,9 +594,6 @@ soup_logger_set_response_filter <SUBSECTION> SoupLoggerPrinter soup_logger_set_printer -<SUBSECTION> -SOUP_LOGGER_LEVEL -SOUP_LOGGER_MAX_BODY_SIZE <SUBSECTION Standard> SoupLoggerClass soup_logger_get_type @@ -750,9 +679,6 @@ soup_cookie_jar_get_accept_policy soup_cookie_jar_set_accept_policy <SUBSECTION> soup_cookie_jar_is_persistent -<SUBSECTION> -SOUP_COOKIE_JAR_READ_ONLY -SOUP_COOKIE_JAR_ACCEPT_POLICY <SUBSECTION Standard> SoupCookieJarClass SOUP_COOKIE_JAR @@ -809,8 +735,6 @@ SoupMultipartInputStreamPrivate <TITLE>SoupCookieJarText</TITLE> SoupCookieJarText soup_cookie_jar_text_new -<SUBSECTION> -SOUP_COOKIE_JAR_TEXT_FILENAME <SUBSECTION Standard> SoupCookieJarTextClass SOUP_COOKIE_JAR_TEXT @@ -827,8 +751,6 @@ soup_cookie_jar_text_get_type <TITLE>SoupCookieJarDB</TITLE> SoupCookieJarDB soup_cookie_jar_db_new -<SUBSECTION> -SOUP_COOKIE_JAR_DB_FILENAME <SUBSECTION Standard> SoupCookieJarDBClass SOUP_COOKIE_JAR_DB @@ -1137,8 +1059,6 @@ soup_hsts_enforcer_set_policy soup_hsts_enforcer_set_session_policy soup_hsts_enforcer_get_domains soup_hsts_enforcer_get_policies -<SUBSECTION> -SOUP_HSTS_ENFORCER_DB_FILENAME <SUBSECTION Standard> SOUP_HSTS_ENFORCER SOUP_HSTS_ENFORCER_CLASS diff --git a/docs/reference/server-howto.xml b/docs/reference/server-howto.xml index f24d61ea..0372a319 100644 --- a/docs/reference/server-howto.xml +++ b/docs/reference/server-howto.xml @@ -30,7 +30,7 @@ a few additional options: <variablelist> <varlistentry> - <term><link linkend="SOUP-SERVER-TLS-CERTIFICATE:CAPS"><literal>SOUP_SERVER_TLS_CERTIFICATE</literal></link></term> + <term><link linkend="SoupServer:tls-certificate"><literal>"tls-certificate"</literal></link></term> <listitem><para> A <link linkend="GTlsCertificate"><type>GTlsCertificate</type></link> @@ -39,7 +39,7 @@ a few additional options: </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SERVER-RAW-PATHS:CAPS"><literal>SOUP_SERVER_RAW_PATHS</literal></link></term> + <term><link linkend="SoupServer:raw-paths"><literal>"raw-paths"</literal></link></term> <listitem><para> Set this to <literal>TRUE</literal> if you don't want <application>libsoup</application> to decode %-encoding @@ -49,15 +49,15 @@ a few additional options: </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SERVER-SERVER-HEADER:CAPS"><literal>SOUP_SERVER_SERVER_HEADER</literal></link></term> + <term><link linkend="SoupServer:server-header"><literal>"server-header"</literal></link></term> <listitem><para> Allows you to set a Server header string that will be sent on all responses. </para></listitem> </varlistentry> <varlistentry> - <term><link linkend="SOUP-SERVER-HTTP-ALIASES:CAPS"><literal>SOUP_SERVER_HTTP_ALIASES</literal></link> - and <link linkend="SOUP-SERVER-HTTPS-ALIASES:CAPS"><literal>SOUP_SERVER_HTTPS_ALIASES</literal></link></term> + <term><link linkend="SoupServer:http-aliases"><literal>"http-aliases"</literal></link> + and <link linkend="SoupServer:https-aliases"><literal>"https-aliases"</literal></link></term> <listitem><para> Allow you to tell the server to recognize additional URI schemes as aliases for "<literal>http</literal>" or @@ -88,7 +88,7 @@ a few additional options: <para> To set up an HTTPS server, you must first either set the <link - linkend="SOUP-SERVER-TLS-CERTIFICATE:CAPS"><literal>SOUP_SERVER_TLS_CERTIFICATE</literal></link> + linkend="SoupServer:tls-certificate"><literal>SoupServer:tls-certificate</literal></link> property, or else call <link linkend="soup-server-set-ssl-cert-file"><function>soup_server_set_ssl_cert_file</function></link>. After that you can pass the <link @@ -317,11 +317,11 @@ linkend="soup-server-add-auth-domain"><function>soup_server_add_auth_domain</fun SoupAuthDomain *domain; domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "My Realm", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, auth_callback, - SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA, auth_data, - SOUP_AUTH_DOMAIN_ADD_PATH, "/foo", - SOUP_AUTH_DOMAIN_ADD_PATH, "/bar/private", + "realm", "My Realm", + "auth-callback", auth_callback, + "auth-data", auth_data, + "add-path", "/foo", + "add-path", "/bar/private", NULL); soup_server_add_auth_domain (server, domain); g_object_unref (domain); diff --git a/examples/get.c b/examples/get.c index 67e72f2a..0a429252 100644 --- a/examples/get.c +++ b/examples/get.c @@ -224,10 +224,10 @@ main (int argc, char **argv) soup_uri_free (parsed); session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER, - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_COOKIE_JAR, - SOUP_SESSION_USER_AGENT, "get ", - SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, TRUE, + "add-feature-by-type", SOUP_TYPE_CONTENT_DECODER, + "add-feature-by-type", SOUP_TYPE_COOKIE_JAR, + "user-agent", "get ", + "accept-language-auto", TRUE, NULL); if (ntlm) soup_session_add_feature_by_type (session, SOUP_TYPE_AUTH_NTLM); @@ -247,7 +247,7 @@ main (int argc, char **argv) exit (1); } interaction = _get_tls_cert_interaction_new (client_cert); - g_object_set (session, SOUP_SESSION_TLS_INTERACTION, interaction, NULL); + g_object_set (session, "tls-interaction", interaction, NULL); } if (debug) { @@ -267,7 +267,7 @@ main (int argc, char **argv) resolver = g_simple_proxy_resolver_new (proxy, NULL); g_object_set (G_OBJECT (session), - SOUP_SESSION_PROXY_RESOLVER, resolver, + "proxy-resolver", resolver, NULL); soup_uri_free (proxy_uri); g_object_unref (resolver); diff --git a/examples/simple-httpd.c b/examples/simple-httpd.c index 9d280ac3..8cfed4b5 100644 --- a/examples/simple-httpd.c +++ b/examples/simple-httpd.c @@ -270,14 +270,14 @@ main (int argc, char **argv) g_printerr ("Unable to create server: %s\n", error->message); exit (1); } - server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "simple-httpd ", - SOUP_SERVER_TLS_CERTIFICATE, cert, + server = soup_server_new ("server-header", "simple-httpd ", + "tls-certificate", cert, NULL); g_object_unref (cert); soup_server_listen_all (server, port, SOUP_SERVER_LISTEN_HTTPS, &error); } else { - server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "simple-httpd ", + server = soup_server_new ("server-header", "simple-httpd ", NULL); soup_server_listen_all (server, port, 0, &error); } diff --git a/examples/simple-proxy.c b/examples/simple-proxy.c index b1f2abde..4f8f5af3 100644 --- a/examples/simple-proxy.c +++ b/examples/simple-proxy.c @@ -382,9 +382,9 @@ main (int argc, char **argv) SoupAuthDomain *auth_domain; auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "simple-proxy", - SOUP_AUTH_DOMAIN_PROXY, TRUE, - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, auth_callback, + "realm", "simple-proxy", + "proxy", TRUE, + "auth-callback", auth_callback, NULL); soup_server_add_auth_domain (server, auth_domain); g_object_unref (auth_domain); diff --git a/libsoup/auth/soup-auth-manager.c b/libsoup/auth/soup-auth-manager.c index fad393f1..86f249d4 100644 --- a/libsoup/auth/soup-auth-manager.c +++ b/libsoup/auth/soup-auth-manager.c @@ -427,7 +427,7 @@ make_auto_ntlm_auth (SoupAuthManagerPrivate *priv, SoupAuthHost *host) return FALSE; auth = g_object_new (SOUP_TYPE_AUTH_NTLM, - SOUP_AUTH_HOST, host->uri->host, + "host", host->uri->host, NULL); record_auth_for_uri (priv, host->uri, auth, FALSE); g_object_unref (auth); diff --git a/libsoup/auth/soup-auth-negotiate.c b/libsoup/auth/soup-auth-negotiate.c index de4a778d..ddae3b98 100644 --- a/libsoup/auth/soup-auth-negotiate.c +++ b/libsoup/auth/soup-auth-negotiate.c @@ -80,7 +80,7 @@ typedef struct { * * A #GType corresponding to HTTP-based GSS-Negotiate authentication. * #SoupSessions do not support this type by default; if you want to - * enable support for it, call soup_session_add_feature_by_type(), + * enable support for it, call "add-feature-by-type"(), * passing %SOUP_TYPE_AUTH_NEGOTIATE. * * This auth type will only work if libsoup was compiled with GSSAPI @@ -303,7 +303,7 @@ soup_auth_negotiate_update_connection (SoupConnectionAuth *auth, SoupMessage *ms static void soup_auth_negotiate_init (SoupAuthNegotiate *negotiate) { - g_object_set (G_OBJECT (negotiate), SOUP_AUTH_REALM, "", NULL); + g_object_set (G_OBJECT (negotiate), "realm", "", NULL); } static void diff --git a/libsoup/auth/soup-auth-ntlm.c b/libsoup/auth/soup-auth-ntlm.c index 7a9b7ac3..6cc93b6e 100644 --- a/libsoup/auth/soup-auth-ntlm.c +++ b/libsoup/auth/soup-auth-ntlm.c @@ -397,8 +397,8 @@ soup_auth_ntlm_update_connection (SoupConnectionAuth *auth, SoupMessage *msg, conn->state = SOUP_NTLM_RECEIVED_CHALLENGE; g_object_set (G_OBJECT (auth), - SOUP_AUTH_REALM, priv->domain, - SOUP_AUTH_HOST, soup_message_get_uri (msg)->host, + "realm", priv->domain, + "host", soup_message_get_uri (msg)->host, NULL); return success; } diff --git a/libsoup/auth/soup-auth.c b/libsoup/auth/soup-auth.c index 7e5a5f70..881ed9f9 100644 --- a/libsoup/auth/soup-auth.c +++ b/libsoup/auth/soup-auth.c @@ -144,70 +144,65 @@ soup_auth_class_init (SoupAuthClass *auth_class) /* properties */ /** - * SOUP_AUTH_SCHEME_NAME: - * - * An alias for the #SoupAuth:scheme-name property. (The - * authentication scheme name.) + * SoupAuth:scheme-name: + * + * The authentication scheme name. **/ g_object_class_install_property ( object_class, PROP_SCHEME_NAME, - g_param_spec_string (SOUP_AUTH_SCHEME_NAME, + g_param_spec_string ("scheme-name", "Scheme name", "Authentication scheme name", NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_REALM: + * SoupAuth:realm: * - * An alias for the #SoupAuth:realm property. (The - * authentication realm.) + * The authentication realm. **/ g_object_class_install_property ( object_class, PROP_REALM, - g_param_spec_string (SOUP_AUTH_REALM, + g_param_spec_string ("realm", "Realm", "Authentication realm", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_HOST: + * SoupAuth:host: * - * An alias for the #SoupAuth:host property. (The - * host being authenticated to.) + * The host being authenticated to. **/ g_object_class_install_property ( object_class, PROP_HOST, - g_param_spec_string (SOUP_AUTH_HOST, + g_param_spec_string ("host", "Host", "Authentication host", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_IS_FOR_PROXY: + * SoupAuth:is-for-proxy: * - * An alias for the #SoupAuth:is-for-proxy property. (Whether - * or not the auth is for a proxy server.) + * Whether or not the auth is for a proxy server. **/ g_object_class_install_property ( object_class, PROP_IS_FOR_PROXY, - g_param_spec_boolean (SOUP_AUTH_IS_FOR_PROXY, + g_param_spec_boolean ("is-for-proxy", "For Proxy", "Whether or not the auth is for a proxy server", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_IS_AUTHENTICATED: + * SoupAuth:is-authenticated: * - * An alias for the #SoupAuth:is-authenticated property. - * (Whether or not the auth has been authenticated.) + * Whether or not the auth has been authenticated. **/ g_object_class_install_property ( object_class, PROP_IS_AUTHENTICATED, - g_param_spec_boolean (SOUP_AUTH_IS_AUTHENTICATED, + g_param_spec_boolean ("is-authenticated", "Authenticated", "Whether or not the auth is authenticated", FALSE, @@ -242,8 +237,8 @@ soup_auth_new (GType type, SoupMessage *msg, const char *auth_header) g_return_val_if_fail (auth_header != NULL, NULL); auth = g_object_new (type, - SOUP_AUTH_IS_FOR_PROXY, (msg->status_code == SOUP_STATUS_PROXY_UNAUTHORIZED), - SOUP_AUTH_HOST, soup_message_get_uri (msg)->host, + "is-for-proxy", (msg->status_code == SOUP_STATUS_PROXY_UNAUTHORIZED), + "host", soup_message_get_uri (msg)->host, NULL); SoupAuthPrivate *priv = soup_auth_get_instance_private (auth); @@ -311,7 +306,7 @@ soup_auth_update (SoupAuth *auth, SoupMessage *msg, const char *auth_header) was_authenticated = soup_auth_is_authenticated (auth); success = SOUP_AUTH_GET_CLASS (auth)->update (auth, msg, params); if (was_authenticated != soup_auth_is_authenticated (auth)) - g_object_notify (G_OBJECT (auth), SOUP_AUTH_IS_AUTHENTICATED); + g_object_notify (G_OBJECT (auth), "is-authenticated"); soup_header_free_param_list (params); return success; } @@ -337,7 +332,7 @@ soup_auth_authenticate (SoupAuth *auth, const char *username, const char *passwo was_authenticated = soup_auth_is_authenticated (auth); SOUP_AUTH_GET_CLASS (auth)->authenticate (auth, username, password); if (was_authenticated != soup_auth_is_authenticated (auth)) - g_object_notify (G_OBJECT (auth), SOUP_AUTH_IS_AUTHENTICATED); + g_object_notify (G_OBJECT (auth), "is-authenticated"); } /** diff --git a/libsoup/auth/soup-auth.h b/libsoup/auth/soup-auth.h index c9b78933..ab3f2519 100644 --- a/libsoup/auth/soup-auth.h +++ b/libsoup/auth/soup-auth.h @@ -43,12 +43,6 @@ struct _SoupAuthClass { gpointer padding[6]; }; -#define SOUP_AUTH_SCHEME_NAME "scheme-name" -#define SOUP_AUTH_REALM "realm" -#define SOUP_AUTH_HOST "host" -#define SOUP_AUTH_IS_FOR_PROXY "is-for-proxy" -#define SOUP_AUTH_IS_AUTHENTICATED "is-authenticated" - SOUP_AVAILABLE_IN_2_4 SoupAuth *soup_auth_new (GType type, SoupMessage *msg, diff --git a/libsoup/cookies/soup-cookie-jar-db.c b/libsoup/cookies/soup-cookie-jar-db.c index 7ee9123f..20aeb98f 100644 --- a/libsoup/cookies/soup-cookie-jar-db.c +++ b/libsoup/cookies/soup-cookie-jar-db.c @@ -128,8 +128,8 @@ soup_cookie_jar_db_new (const char *filename, gboolean read_only) g_return_val_if_fail (filename != NULL, NULL); return g_object_new (SOUP_TYPE_COOKIE_JAR_DB, - SOUP_COOKIE_JAR_DB_FILENAME, filename, - SOUP_COOKIE_JAR_READ_ONLY, read_only, + "filename", filename, + "read-only", read_only, NULL); } @@ -332,15 +332,9 @@ soup_cookie_jar_db_class_init (SoupCookieJarDBClass *db_class) object_class->set_property = soup_cookie_jar_db_set_property; object_class->get_property = soup_cookie_jar_db_get_property; - /** - * SOUP_COOKIE_JAR_DB_FILENAME: - * - * Alias for the #SoupCookieJarDB:filename property. (The - * cookie-storage filename.) - **/ g_object_class_install_property ( object_class, PROP_FILENAME, - g_param_spec_string (SOUP_COOKIE_JAR_DB_FILENAME, + g_param_spec_string ("filename", "Filename", "Cookie-storage filename", NULL, diff --git a/libsoup/cookies/soup-cookie-jar-db.h b/libsoup/cookies/soup-cookie-jar-db.h index 084599f9..8dbdb2e1 100644 --- a/libsoup/cookies/soup-cookie-jar-db.h +++ b/libsoup/cookies/soup-cookie-jar-db.h @@ -13,8 +13,6 @@ G_BEGIN_DECLS SOUP_AVAILABLE_IN_2_42 G_DECLARE_FINAL_TYPE (SoupCookieJarDB, soup_cookie_jar_db, SOUP, COOKIE_JAR_DB, SoupCookieJar) -#define SOUP_COOKIE_JAR_DB_FILENAME "filename" - SOUP_AVAILABLE_IN_2_42 SoupCookieJar *soup_cookie_jar_db_new (const char *filename, gboolean read_only); diff --git a/libsoup/cookies/soup-cookie-jar-text.c b/libsoup/cookies/soup-cookie-jar-text.c index 7a57494d..7fd4ce42 100644 --- a/libsoup/cookies/soup-cookie-jar-text.c +++ b/libsoup/cookies/soup-cookie-jar-text.c @@ -122,8 +122,8 @@ soup_cookie_jar_text_new (const char *filename, gboolean read_only) g_return_val_if_fail (filename != NULL, NULL); return g_object_new (SOUP_TYPE_COOKIE_JAR_TEXT, - SOUP_COOKIE_JAR_TEXT_FILENAME, filename, - SOUP_COOKIE_JAR_READ_ONLY, read_only, + "filename", filename, + "read-only", read_only, NULL); } @@ -387,15 +387,9 @@ soup_cookie_jar_text_class_init (SoupCookieJarTextClass *text_class) object_class->set_property = soup_cookie_jar_text_set_property; object_class->get_property = soup_cookie_jar_text_get_property; - /** - * SOUP_COOKIE_JAR_TEXT_FILENAME: - * - * Alias for the #SoupCookieJarText:filename property. (The - * cookie-storage filename.) - **/ g_object_class_install_property ( object_class, PROP_FILENAME, - g_param_spec_string (SOUP_COOKIE_JAR_TEXT_FILENAME, + g_param_spec_string ("filename", "Filename", "Cookie-storage filename", NULL, diff --git a/libsoup/cookies/soup-cookie-jar-text.h b/libsoup/cookies/soup-cookie-jar-text.h index 80135484..c776989d 100644 --- a/libsoup/cookies/soup-cookie-jar-text.h +++ b/libsoup/cookies/soup-cookie-jar-text.h @@ -13,8 +13,6 @@ G_BEGIN_DECLS SOUP_AVAILABLE_IN_2_26 G_DECLARE_FINAL_TYPE (SoupCookieJarText, soup_cookie_jar_text, SOUP, COOKIE_JAR_TEXT, SoupCookieJar) -#define SOUP_COOKIE_JAR_TEXT_FILENAME "filename" - SOUP_AVAILABLE_IN_2_26 SoupCookieJar *soup_cookie_jar_text_new (const char *filename, gboolean read_only); diff --git a/libsoup/cookies/soup-cookie-jar.c b/libsoup/cookies/soup-cookie-jar.c index f46d527b..850bb38e 100644 --- a/libsoup/cookies/soup-cookie-jar.c +++ b/libsoup/cookies/soup-cookie-jar.c @@ -182,15 +182,9 @@ soup_cookie_jar_class_init (SoupCookieJarClass *jar_class) SOUP_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE, SOUP_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE); - /** - * SOUP_COOKIE_JAR_READ_ONLY: - * - * Alias for the #SoupCookieJar:read-only property. (Whether - * or not the cookie jar is read-only.) - **/ g_object_class_install_property ( object_class, PROP_READ_ONLY, - g_param_spec_boolean (SOUP_COOKIE_JAR_READ_ONLY, + g_param_spec_boolean ("read-only", "Read-only", "Whether or not the cookie jar is read-only", FALSE, @@ -198,13 +192,6 @@ soup_cookie_jar_class_init (SoupCookieJarClass *jar_class) G_PARAM_STATIC_STRINGS)); /** - * SOUP_COOKIE_JAR_ACCEPT_POLICY: - * - * Alias for the #SoupCookieJar:accept-policy property. - * - * Since: 2.30 - */ - /** * SoupCookieJar:accept-policy: * * The policy the jar should follow to accept or reject cookies @@ -213,7 +200,7 @@ soup_cookie_jar_class_init (SoupCookieJarClass *jar_class) */ g_object_class_install_property ( object_class, PROP_ACCEPT_POLICY, - g_param_spec_enum (SOUP_COOKIE_JAR_ACCEPT_POLICY, + g_param_spec_enum ("accept-policy", "Accept-policy", "The policy the jar should follow to accept or reject cookies", SOUP_TYPE_COOKIE_JAR_ACCEPT_POLICY, @@ -1008,7 +995,7 @@ soup_cookie_jar_set_accept_policy (SoupCookieJar *jar, if (priv->accept_policy != policy) { priv->accept_policy = policy; - g_object_notify (G_OBJECT (jar), SOUP_COOKIE_JAR_ACCEPT_POLICY); + g_object_notify (G_OBJECT (jar), "accept-policy"); } } diff --git a/libsoup/cookies/soup-cookie-jar.h b/libsoup/cookies/soup-cookie-jar.h index 32c0a15e..7c4b4142 100644 --- a/libsoup/cookies/soup-cookie-jar.h +++ b/libsoup/cookies/soup-cookie-jar.h @@ -28,9 +28,6 @@ struct _SoupCookieJarClass { gpointer padding[6]; }; -#define SOUP_COOKIE_JAR_READ_ONLY "read-only" -#define SOUP_COOKIE_JAR_ACCEPT_POLICY "accept-policy" - typedef enum { SOUP_COOKIE_JAR_ACCEPT_ALWAYS, SOUP_COOKIE_JAR_ACCEPT_NEVER, diff --git a/libsoup/hsts/soup-hsts-enforcer-db.c b/libsoup/hsts/soup-hsts-enforcer-db.c index fd1a6997..d6024452 100644 --- a/libsoup/hsts/soup-hsts-enforcer-db.c +++ b/libsoup/hsts/soup-hsts-enforcer-db.c @@ -120,7 +120,7 @@ soup_hsts_enforcer_db_new (const char *filename) g_return_val_if_fail (filename != NULL, NULL); return g_object_new (SOUP_TYPE_HSTS_ENFORCER_DB, - SOUP_HSTS_ENFORCER_DB_FILENAME, filename, + "filename", filename, NULL); } @@ -332,7 +332,7 @@ soup_hsts_enforcer_db_class_init (SoupHSTSEnforcerDBClass *db_class) **/ g_object_class_install_property ( object_class, PROP_FILENAME, - g_param_spec_string (SOUP_HSTS_ENFORCER_DB_FILENAME, + g_param_spec_string ("filename", "Filename", "HSTS policy storage filename", NULL, diff --git a/libsoup/hsts/soup-hsts-enforcer-db.h b/libsoup/hsts/soup-hsts-enforcer-db.h index 2ff3ba1f..8e83574e 100644 --- a/libsoup/hsts/soup-hsts-enforcer-db.h +++ b/libsoup/hsts/soup-hsts-enforcer-db.h @@ -14,8 +14,6 @@ G_BEGIN_DECLS SOUP_AVAILABLE_IN_2_68 G_DECLARE_FINAL_TYPE (SoupHSTSEnforcerDB, soup_hsts_enforcer_db, SOUP, HSTS_ENFORCER_DB, SoupHSTSEnforcer) -#define SOUP_HSTS_ENFORCER_DB_FILENAME "filename" - SOUP_AVAILABLE_IN_2_68 SoupHSTSEnforcer *soup_hsts_enforcer_db_new (const char *filename); diff --git a/libsoup/server/soup-auth-domain-basic.c b/libsoup/server/soup-auth-domain-basic.c index 0cba37d2..44944a26 100644 --- a/libsoup/server/soup-auth-domain-basic.c +++ b/libsoup/server/soup-auth-domain-basic.c @@ -110,7 +110,7 @@ soup_auth_domain_basic_get_property (GObject *object, guint prop_id, * @...: option name/value pairs * * Creates a #SoupAuthDomainBasic. You must set the - * %SOUP_AUTH_DOMAIN_REALM parameter, to indicate the realm name to be + * SoupAuthDomain:realm property, to indicate the realm name to be * returned with the authentication challenge to the client. Other * parameters are optional. * @@ -172,8 +172,8 @@ soup_auth_domain_basic_new (const char *optname1, ...) * based on @callback's return value. * * You can also set the auth callback by setting the - * %SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK and - * %SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA properties, which can also be + * SoupAuthDomainBasic:auth-callback and + * SoupAuthDomainBasic:auth-data properties, which can also be * used to set the callback at construct time. **/ void @@ -192,8 +192,8 @@ soup_auth_domain_basic_set_auth_callback (SoupAuthDomain *domain, priv->auth_data = user_data; priv->auth_dnotify = dnotify; - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK); - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA); + g_object_notify (G_OBJECT (domain), "auth-callback"); + g_object_notify (G_OBJECT (domain), "auth-data"); } static void @@ -313,37 +313,25 @@ soup_auth_domain_basic_class_init (SoupAuthDomainBasicClass *basic_class) object_class->get_property = soup_auth_domain_basic_get_property; /** - * SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK: - * - * 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, + g_param_spec_pointer ("auth-callback", "Authentication callback", "Password-checking callback", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA: - * - * 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, + g_param_spec_pointer ("auth-data", "Authentication callback data", "Data to pass to authentication callback", G_PARAM_READWRITE | diff --git a/libsoup/server/soup-auth-domain-basic.h b/libsoup/server/soup-auth-domain-basic.h index d0397051..039f4bbf 100644 --- a/libsoup/server/soup-auth-domain-basic.h +++ b/libsoup/server/soup-auth-domain-basic.h @@ -13,9 +13,6 @@ G_BEGIN_DECLS SOUP_AVAILABLE_IN_2_4 G_DECLARE_FINAL_TYPE (SoupAuthDomainBasic, soup_auth_domain_basic, SOUP, AUTH_DOMAIN_BASIC, SoupAuthDomain) -#define SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK "auth-callback" -#define SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA "auth-data" - SOUP_AVAILABLE_IN_2_4 SoupAuthDomain *soup_auth_domain_basic_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; diff --git a/libsoup/server/soup-auth-domain-digest.c b/libsoup/server/soup-auth-domain-digest.c index 1ad34a91..da3e674c 100644 --- a/libsoup/server/soup-auth-domain-digest.c +++ b/libsoup/server/soup-auth-domain-digest.c @@ -113,7 +113,7 @@ soup_auth_domain_digest_get_property (GObject *object, guint prop_id, * @...: option name/value pairs * * Creates a #SoupAuthDomainDigest. You must set the - * %SOUP_AUTH_DOMAIN_REALM parameter, to indicate the realm name to be + * SoupAuthDomain:realm property, to indicate the realm name to be * returned with the authentication challenge to the client. Other * parameters are optional. * @@ -166,8 +166,8 @@ soup_auth_domain_digest_new (const char *optname1, ...) * based on @callback's return value. * * You can also set the auth callback by setting the - * %SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK and - * %SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA properties, which can also be + * SoupAuthDomainDigest:auth-callback and + * SoupAuthDomainDigest:auth-data properties, which can also be * used to set the callback at construct time. **/ void @@ -186,8 +186,8 @@ soup_auth_domain_digest_set_auth_callback (SoupAuthDomain *domain, priv->auth_data = user_data; priv->auth_dnotify = dnotify; - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK); - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA); + g_object_notify (G_OBJECT (domain), "auth-callback"); + g_object_notify (G_OBJECT (domain), "auth-data"); } static gboolean @@ -421,37 +421,25 @@ soup_auth_domain_digest_class_init (SoupAuthDomainDigestClass *digest_class) object_class->get_property = soup_auth_domain_digest_get_property; /** - * SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK: - * - * 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, + g_param_spec_pointer ("auth-callback", "Authentication callback", "Password-finding callback", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA: - * - * 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, + g_param_spec_pointer ("auth-data", "Authentication callback data", "Data to pass to authentication callback", G_PARAM_READWRITE | diff --git a/libsoup/server/soup-auth-domain-digest.h b/libsoup/server/soup-auth-domain-digest.h index c5630470..bf8ec95e 100644 --- a/libsoup/server/soup-auth-domain-digest.h +++ b/libsoup/server/soup-auth-domain-digest.h @@ -13,9 +13,6 @@ G_BEGIN_DECLS SOUP_AVAILABLE_IN_2_4 G_DECLARE_FINAL_TYPE (SoupAuthDomainDigest, soup_auth_domain_digest, SOUP, AUTH_DOMAIN_DIGEST, SoupAuthDomain) -#define SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK "auth-callback" -#define SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA "auth-data" - SOUP_AVAILABLE_IN_2_4 SoupAuthDomain *soup_auth_domain_digest_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; diff --git a/libsoup/server/soup-auth-domain.c b/libsoup/server/soup-auth-domain.c index f22cd9ea..5fba8eb4 100644 --- a/libsoup/server/soup-auth-domain.c +++ b/libsoup/server/soup-auth-domain.c @@ -27,7 +27,7 @@ * * In order for an auth domain to have any effect, you must add one or * more paths to it (via soup_auth_domain_add_path() or the - * %SOUP_AUTH_DOMAIN_ADD_PATH property). To require authentication for + * SoupAuthDomain:add-path property). To require authentication for * all ordinary requests, add the path "/". (Note that this does not * include the special "*" URI (eg, "OPTIONS *"), which must be added * as a separate path if you want to cover it.) @@ -184,120 +184,94 @@ soup_auth_domain_class_init (SoupAuthDomainClass *auth_domain_class) object_class->set_property = soup_auth_domain_set_property; object_class->get_property = soup_auth_domain_get_property; - /** - * SOUP_AUTH_DOMAIN_REALM: - * - * Alias for the #SoupAuthDomain:realm property. (The realm of - * this auth domain.) - **/ g_object_class_install_property ( object_class, PROP_REALM, - g_param_spec_string (SOUP_AUTH_DOMAIN_REALM, + g_param_spec_string ("realm", "Realm", "The realm of this auth domain", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_AUTH_DOMAIN_PROXY: - * - * Alias for the #SoupAuthDomain:proxy property. (Whether or - * not this is a proxy auth domain.) - **/ + g_object_class_install_property ( object_class, PROP_PROXY, - g_param_spec_boolean (SOUP_AUTH_DOMAIN_PROXY, + g_param_spec_boolean ("proxy", "Proxy", "Whether or not this is a proxy auth domain", FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_ADD_PATH: + * SoupAuthDomain:add-path: * - * Alias for the #SoupAuthDomain:add-path property. (Shortcut - * for calling soup_auth_domain_add_path().) + * Shortcut for calling soup_auth_domain_add_path(). **/ g_object_class_install_property ( object_class, PROP_ADD_PATH, - g_param_spec_string (SOUP_AUTH_DOMAIN_ADD_PATH, + g_param_spec_string ("add-path", "Add a path", "Add a path covered by this auth domain", NULL, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_REMOVE_PATH: + * SoupAuthDomain:remove-path: * - * Alias for the #SoupAuthDomain:remove-path property. - * (Shortcut for calling soup_auth_domain_remove_path().) + * Shortcut for calling soup_auth_domain_remove_path(). **/ g_object_class_install_property ( object_class, PROP_REMOVE_PATH, - g_param_spec_string (SOUP_AUTH_DOMAIN_REMOVE_PATH, + g_param_spec_string ("remove-path", "Remove a path", "Remove a path covered by this auth domain", NULL, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_AUTH_DOMAIN_FILTER: - * - * Alias for the #SoupAuthDomain:filter property. (The - * #SoupAuthDomainFilter for the domain.) - **/ + /** * SoupAuthDomain:filter: (type SoupAuthDomainFilter) * - * The #SoupAuthDomainFilter for the domain + * The #SoupAuthDomainFilter for the domain. */ g_object_class_install_property ( object_class, PROP_FILTER, - g_param_spec_pointer (SOUP_AUTH_DOMAIN_FILTER, + g_param_spec_pointer ("filter", "Filter", "A filter for deciding whether or not to require authentication", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_FILTER_DATA: + * SoupAuthDomain:filter-data: * - * Alias for the #SoupAuthDomain:filter-data property. (Data - * to pass to the #SoupAuthDomainFilter.) + * Data to pass to the #SoupAuthDomainFilter. **/ - /** - * SoupAuthDomain:generic-auth-callback: (type SoupAuthDomainGenericAuthCallback) - * - * The #SoupAuthDomainGenericAuthCallback for the domain - */ g_object_class_install_property ( object_class, PROP_FILTER_DATA, - g_param_spec_pointer (SOUP_AUTH_DOMAIN_FILTER_DATA, + g_param_spec_pointer ("filter-data", "Filter data", "Data to pass to filter", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK: + * SoupAuthDomain:generic-auth-callback: (type SoupAuthDomainGenericAuthCallback) * - * Alias for the #SoupAuthDomain:generic-auth-callback property. - * (The #SoupAuthDomainGenericAuthCallback.) + * The #SoupAuthDomainGenericAuthCallback. **/ g_object_class_install_property ( object_class, PROP_GENERIC_AUTH_CALLBACK, - g_param_spec_pointer (SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK, + g_param_spec_pointer ("generic-auth-callback", "Generic authentication callback", "An authentication callback that can be used with any SoupAuthDomain subclass", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA: + * SoupAuthDomain:generic-auth-data: * - * Alias for the #SoupAuthDomain:generic-auth-data property. - * (The data to pass to the #SoupAuthDomainGenericAuthCallback.) + * The data to pass to the #SoupAuthDomainGenericAuthCallback. **/ g_object_class_install_property ( object_class, PROP_GENERIC_AUTH_DATA, - g_param_spec_pointer (SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA, + g_param_spec_pointer ("generic-auth-data", "Authentication callback data", "Data to pass to auth callback", G_PARAM_READWRITE | @@ -313,7 +287,7 @@ soup_auth_domain_class_init (SoupAuthDomainClass *auth_domain_class) * server will require authentication (unless overridden by * soup_auth_domain_remove_path() or soup_auth_domain_set_filter()). * - * You can also add paths by setting the %SOUP_AUTH_DOMAIN_ADD_PATH + * You can also add paths by setting the SoupAuthDomain:add-path * property, which can also be used to add one or more paths at * construct time. **/ @@ -346,7 +320,7 @@ soup_auth_domain_add_path (SoupAuthDomain *domain, const char *path) * otherwise be unnecessary. * * You can also remove paths by setting the - * %SOUP_AUTH_DOMAIN_REMOVE_PATH property, which can also be used to + * SoupAuthDomain:remove-path property, which can also be used to * remove one or more paths at construct time. **/ void @@ -402,8 +376,8 @@ soup_auth_domain_remove_path (SoupAuthDomain *domain, const char *path) * GET and PUT, those methods would default to being NOT allowed for * unauthenticated users. * - * You can also set the filter by setting the %SOUP_AUTH_DOMAIN_FILTER - * and %SOUP_AUTH_DOMAIN_FILTER_DATA properties, which can also be + * You can also set the filter by setting the SoupAuthDomain:filter + * and SoupAuthDomain:filter-data properties, which can also be * used to set the filter at construct time. **/ void @@ -421,8 +395,8 @@ soup_auth_domain_set_filter (SoupAuthDomain *domain, priv->filter_data = filter_data; priv->filter_dnotify = dnotify; - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_FILTER); - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_FILTER_DATA); + g_object_notify (G_OBJECT (domain), "filter"); + g_object_notify (G_OBJECT (domain), "filter-data"); } /** @@ -499,8 +473,8 @@ soup_auth_domain_set_generic_auth_callback (SoupAuthDomain *domain, priv->auth_data = auth_data; priv->auth_dnotify = dnotify; - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK); - g_object_notify (G_OBJECT (domain), SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA); + g_object_notify (G_OBJECT (domain), "generic-auth-callback"); + g_object_notify (G_OBJECT (domain), "generic-auth-data"); } gboolean diff --git a/libsoup/server/soup-auth-domain.h b/libsoup/server/soup-auth-domain.h index c904d01b..ff0f64c7 100644 --- a/libsoup/server/soup-auth-domain.h +++ b/libsoup/server/soup-auth-domain.h @@ -28,15 +28,6 @@ struct _SoupAuthDomainClass { gpointer padding[6]; }; -#define SOUP_AUTH_DOMAIN_REALM "realm" -#define SOUP_AUTH_DOMAIN_PROXY "proxy" -#define SOUP_AUTH_DOMAIN_ADD_PATH "add-path" -#define SOUP_AUTH_DOMAIN_REMOVE_PATH "remove-path" -#define SOUP_AUTH_DOMAIN_FILTER "filter" -#define SOUP_AUTH_DOMAIN_FILTER_DATA "filter-data" -#define SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK "generic-auth-callback" -#define SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA "generic-auth-data" - typedef gboolean (*SoupAuthDomainFilter) (SoupAuthDomain *domain, SoupServerMessage *msg, gpointer user_data); diff --git a/libsoup/server/soup-server.c b/libsoup/server/soup-server.c index 2802f66a..86357f9f 100644 --- a/libsoup/server/soup-server.c +++ b/libsoup/server/soup-server.c @@ -103,7 +103,7 @@ * * If you want to process https connections in addition to (or instead * of) http connections, you can either set the - * %SOUP_SERVER_TLS_CERTIFICATE property when creating the server, or + * SoupServer:tls-certificate property when creating the server, or * else call soup_server_set_ssl_cert_file() after creating it. * * Once the server is set up, make one or more calls to @@ -476,13 +476,6 @@ soup_server_class_init (SoupServerClass *server_class) /* properties */ /** - * SOUP_SERVER_TLS_CERTIFICATE: - * - * Alias for the #SoupServer:tls-certificate property, qv. - * - * Since: 2.38 - */ - /** * SoupServer:tls-certificate: * * A #GTlsCertificate that has a #GTlsCertificate:private-key @@ -496,22 +489,15 @@ soup_server_class_init (SoupServerClass *server_class) */ g_object_class_install_property ( object_class, PROP_TLS_CERTIFICATE, - g_param_spec_object (SOUP_SERVER_TLS_CERTIFICATE, + g_param_spec_object ("tls-certificate", "TLS certificate", "GTlsCertificate to use for https", G_TYPE_TLS_CERTIFICATE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SERVER_RAW_PATHS: - * - * Alias for the #SoupServer:raw-paths property. (If %TRUE, - * percent-encoding in the Request-URI path will not be - * automatically decoded.) - **/ g_object_class_install_property ( object_class, PROP_RAW_PATHS, - g_param_spec_boolean (SOUP_SERVER_RAW_PATHS, + g_param_spec_boolean ("raw-paths", "Raw paths", "If %TRUE, percent-encoding in the Request-URI path will not be automatically decoded.", FALSE, @@ -545,14 +531,9 @@ soup_server_class_init (SoupServerClass *server_class) * "<literal>libsoup/2.3.2</literal>") to the end of the * header for you. **/ - /** - * SOUP_SERVER_SERVER_HEADER: - * - * Alias for the #SoupServer:server-header property, qv. - **/ g_object_class_install_property ( object_class, PROP_SERVER_HEADER, - g_param_spec_string (SOUP_SERVER_SERVER_HEADER, + g_param_spec_string ("server-header", "Server header", "Server header", NULL, @@ -573,22 +554,15 @@ soup_server_class_init (SoupServerClass *server_class) * The default value is an array containing the single element * <literal>"*"</literal>, a special value which means that * any scheme except "https" is considered to be an alias for - * "http". + * SoupServer:http. * * See also #SoupServer:https-aliases. * * Since: 2.44 */ - /** - * SOUP_SERVER_HTTP_ALIASES: - * - * Alias for the #SoupServer:http-aliases property, qv. - * - * Since: 2.44 - */ g_object_class_install_property ( object_class, PROP_HTTP_ALIASES, - g_param_spec_boxed (SOUP_SERVER_HTTP_ALIASES, + g_param_spec_boxed ("http-aliases", "http aliases", "URI schemes that are considered aliases for 'http'", G_TYPE_STRV, @@ -605,16 +579,9 @@ soup_server_class_init (SoupServerClass *server_class) * * Since: 2.44 */ - /** - * SOUP_SERVER_HTTPS_ALIASES: - * - * Alias for the #SoupServer:https-aliases property, qv. - * - * Since: 2.44 - **/ g_object_class_install_property ( object_class, PROP_HTTPS_ALIASES, - g_param_spec_boxed (SOUP_SERVER_HTTPS_ALIASES, + g_param_spec_boxed ("https-aliases", "https aliases", "URI schemes that are considered aliases for 'https'", G_TYPE_STRV, @@ -628,13 +595,6 @@ soup_server_class_init (SoupServerClass *server_class) * * Since: 2.68 **/ - /** - * SOUP_SERVER_ADD_WEBSOCKET_EXTENSION: (skip) - * - * Alias for the #SoupServer:add-websocket-extension property, qv. - * - * Since: 2.68 - **/ g_object_class_install_property ( object_class, PROP_ADD_WEBSOCKET_EXTENSION, g_param_spec_gtype (SOUP_SERVER_ADD_WEBSOCKET_EXTENSION, @@ -650,13 +610,6 @@ soup_server_class_init (SoupServerClass *server_class) * * Since: 2.68 **/ - /** - * SOUP_SERVER_REMOVE_WEBSOCKET_EXTENSION: (skip) - * - * Alias for the #SoupServer:remove-websocket-extension property, qv. - * - * Since: 2.68 - **/ g_object_class_install_property ( object_class, PROP_REMOVE_WEBSOCKET_EXTENSION, g_param_spec_gtype (SOUP_SERVER_REMOVE_WEBSOCKET_EXTENSION, @@ -1138,8 +1091,8 @@ soup_server_accept_iostream (SoupServer *server, sock = g_initable_new (SOUP_TYPE_SOCKET, NULL, error, "iostream", stream, - SOUP_SOCKET_LOCAL_ADDRESS, local_addr, - SOUP_SOCKET_REMOTE_CONNECTABLE, remote_addr, + "local-address", local_addr, + "remote-connectable", remote_addr, NULL); if (!sock) @@ -1238,12 +1191,12 @@ soup_server_listen_internal (SoupServer *server, SoupSocket *listener, } g_object_set (G_OBJECT (listener), - SOUP_SOCKET_SSL_CREDENTIALS, priv->tls_cert, + "ssl-creds", priv->tls_cert, NULL); } g_object_get (G_OBJECT (listener), - SOUP_SOCKET_IS_SERVER, &is_listening, + "is-server", &is_listening, NULL); if (!is_listening) { if (!soup_socket_listen_full (listener, error)) { @@ -1319,8 +1272,8 @@ soup_server_listen (SoupServer *server, GSocketAddress *address, g_return_val_if_fail (priv->disposed == FALSE, FALSE); ipv6_only = g_socket_address_get_family (address) == G_SOCKET_FAMILY_IPV6; - listener = soup_socket_new (SOUP_SOCKET_LOCAL_ADDRESS, address, - SOUP_SOCKET_IPV6_ONLY, ipv6_only, + listener = soup_socket_new ("local-address", address, + "ipv6-only", ipv6_only, NULL); success = soup_server_listen_internal (server, listener, options, error); @@ -1546,8 +1499,8 @@ soup_server_listen_socket (SoupServer *server, GSocket *socket, g_return_val_if_fail (priv->disposed == FALSE, FALSE); listener = g_initable_new (SOUP_TYPE_SOCKET, NULL, error, - SOUP_SOCKET_GSOCKET, socket, - SOUP_SOCKET_IPV6_ONLY, TRUE, + "gsocket", socket, + "ipv6-only", TRUE, NULL); if (!listener) return FALSE; @@ -1596,7 +1549,7 @@ soup_server_get_uris (SoupServer *server) addr = soup_socket_get_local_address (listener); inet_addr = g_inet_socket_address_get_address (addr); ip = g_inet_address_to_string (inet_addr); - g_object_get (G_OBJECT (listener), SOUP_SOCKET_SSL_CREDENTIALS, &creds, NULL); + g_object_get (G_OBJECT (listener), "ssl-creds", &creds, NULL); uri = soup_uri_new (NULL); soup_uri_set_scheme (uri, creds ? "https" : "http"); @@ -1630,7 +1583,7 @@ soup_server_get_uris (SoupServer *server) * "/foo%<!-- -->2Fbar" is treated the same as "/foo/bar". If your * server is serving resources in some non-POSIX-filesystem namespace, * you may want to distinguish those as two distinct paths. In that - * case, you can set the %SOUP_SERVER_RAW_PATHS property when creating + * case, you can set the SoupServer:raw-paths property when creating * the #SoupServer, and it will leave those characters undecoded. (You * may want to call soup_uri_normalize() to decode any percent-encoded * characters that you aren't handling specially.) @@ -1901,7 +1854,7 @@ soup_server_remove_handler (SoupServer *server, const char *path) * doesn't contain authentication), @server will automatically reject * the request with an appropriate status (401 Unauthorized or 407 * Proxy Authentication Required). If the request used the - * "100-continue" Expectation, @server will reject it before the + * SoupServer:100-continue Expectation, @server will reject it before the * request body is sent. **/ void diff --git a/libsoup/server/soup-server.h b/libsoup/server/soup-server.h index b5225207..3f8dc5d5 100644 --- a/libsoup/server/soup-server.h +++ b/libsoup/server/soup-server.h @@ -37,12 +37,6 @@ struct _SoupServerClass { gpointer padding[6]; }; -#define SOUP_SERVER_TLS_CERTIFICATE "tls-certificate" -#define SOUP_SERVER_RAW_PATHS "raw-paths" -#define SOUP_SERVER_SERVER_HEADER "server-header" -#define SOUP_SERVER_HTTP_ALIASES "http-aliases" -#define SOUP_SERVER_HTTPS_ALIASES "https-aliases" - SOUP_AVAILABLE_IN_2_4 SoupServer *soup_server_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c index 6e39bc7c..dc705e25 100644 --- a/libsoup/soup-connection.c +++ b/libsoup/soup-connection.c @@ -175,7 +175,7 @@ soup_connection_class_init (SoupConnectionClass *connection_class) /* properties */ g_object_class_install_property ( object_class, PROP_REMOTE_URI, - g_param_spec_boxed (SOUP_CONNECTION_REMOTE_URI, + g_param_spec_boxed ("remote-uri", "Remote URI", "The URI of the HTTP server", SOUP_TYPE_URI, @@ -183,7 +183,7 @@ soup_connection_class_init (SoupConnectionClass *connection_class) G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, PROP_SOCKET_PROPERTIES, - g_param_spec_boxed (SOUP_CONNECTION_SOCKET_PROPERTIES, + g_param_spec_boxed ("socket-properties", "Socket properties", "Socket properties", SOUP_TYPE_SOCKET_PROPERTIES, @@ -191,7 +191,7 @@ soup_connection_class_init (SoupConnectionClass *connection_class) G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, PROP_STATE, - g_param_spec_enum (SOUP_CONNECTION_STATE, + g_param_spec_enum ("state", "Connection state", "Current state of connection", SOUP_TYPE_CONNECTION_STATE, SOUP_CONNECTION_NEW, @@ -199,7 +199,7 @@ soup_connection_class_init (SoupConnectionClass *connection_class) G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, PROP_SSL, - g_param_spec_boolean (SOUP_CONNECTION_SSL, + g_param_spec_boolean ("ssl", "Connection uses TLS", "Whether the connection should use TLS", FALSE,G_PARAM_READWRITE | @@ -408,8 +408,8 @@ soup_connection_connect_async (SoupConnection *conn, NULL); priv->socket = - soup_socket_new (SOUP_SOCKET_REMOTE_CONNECTABLE, remote_addr, - SOUP_SOCKET_SOCKET_PROPERTIES, priv->socket_props, + soup_socket_new ("remote-connectable", remote_addr, + "socket-properties", priv->socket_props, NULL); g_object_unref (remote_addr); @@ -453,9 +453,9 @@ soup_connection_connect_sync (SoupConnection *conn, NULL); priv->socket = - soup_socket_new (SOUP_SOCKET_REMOTE_CONNECTABLE, remote_addr, - SOUP_SOCKET_SOCKET_PROPERTIES, priv->socket_props, - SOUP_SOCKET_FLAG_NONBLOCKING, FALSE, + soup_socket_new ("remote-connectable", remote_addr, + "socket-properties", priv->socket_props, + "non-blocking", FALSE, NULL); g_object_unref (remote_addr); diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h index 00c030cf..afb5a4e5 100644 --- a/libsoup/soup-connection.h +++ b/libsoup/soup-connection.h @@ -31,11 +31,6 @@ typedef enum { SOUP_CONNECTION_DISCONNECTED } SoupConnectionState; -#define SOUP_CONNECTION_REMOTE_URI "remote-uri" -#define SOUP_CONNECTION_SOCKET_PROPERTIES "socket-properties" -#define SOUP_CONNECTION_STATE "state" -#define SOUP_CONNECTION_SSL "ssl" - void soup_connection_connect_async (SoupConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c index 8d8652b1..9aba4b69 100644 --- a/libsoup/soup-logger.c +++ b/libsoup/soup-logger.c @@ -224,16 +224,9 @@ soup_logger_class_init (SoupLoggerClass *logger_class) * * Since: 2.56 */ - /** - * SOUP_LOGGER_LEVEL: - * - * Alias for the #SoupLogger:level property, qv. - * - * Since: 2.56 - **/ g_object_class_install_property ( object_class, PROP_LEVEL, - g_param_spec_enum (SOUP_LOGGER_LEVEL, + g_param_spec_enum ("level", "Level", "The level of logging output", SOUP_TYPE_LOGGER_LOG_LEVEL, @@ -250,16 +243,9 @@ soup_logger_class_init (SoupLoggerClass *logger_class) * * Since: 2.56 */ - /** - * SOUP_LOGGER_MAX_BODY_SIZE: - * - * Alias for the #SoupLogger:max-body-size property, qv. - * - * Since: 2.56 - **/ g_object_class_install_property ( object_class, PROP_MAX_BODY_SIZE, - g_param_spec_int (SOUP_LOGGER_MAX_BODY_SIZE, + g_param_spec_int ("max-body-size", "Max Body Size", "The maximum body size to output", -1, @@ -300,8 +286,8 @@ SoupLogger * soup_logger_new (SoupLoggerLogLevel level, int max_body_size) { return g_object_new (SOUP_TYPE_LOGGER, - SOUP_LOGGER_LEVEL, level, - SOUP_LOGGER_MAX_BODY_SIZE, max_body_size, + "level", level, + "max-body-size", max_body_size, NULL); } diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h index e6c6b409..6337ac8a 100644 --- a/libsoup/soup-logger.h +++ b/libsoup/soup-logger.h @@ -30,10 +30,6 @@ typedef void (*SoupLoggerPrinter) (SoupLogger *logger, const char *data, gpointer user_data); - -#define SOUP_LOGGER_LEVEL "level" -#define SOUP_LOGGER_MAX_BODY_SIZE "max-body-size" - SOUP_AVAILABLE_IN_2_4 SoupLogger *soup_logger_new (SoupLoggerLogLevel level, int max_body_size); diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c index 9387aafd..667176cb 100644 --- a/libsoup/soup-message-io.c +++ b/libsoup/soup-message-io.c @@ -489,8 +489,8 @@ parse_headers (SoupMessage *msg, return SOUP_STATUS_MALFORMED; } - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_STATUS_CODE); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_REASON_PHRASE); + g_object_notify (G_OBJECT (msg), "status-code"); + g_object_notify (G_OBJECT (msg), "reason-phrase"); if (version < soup_message_get_http_version (msg)) soup_message_set_http_version (msg, version); diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c index 3b327413..39c0fc1a 100644 --- a/libsoup/soup-message.c +++ b/libsoup/soup-message.c @@ -515,102 +515,57 @@ soup_message_class_init (SoupMessageClass *message_class) G_TYPE_IO_STREAM); /* properties */ - /** - * SOUP_MESSAGE_METHOD: - * - * Alias for the #SoupMessage:method property. (The message's - * HTTP method.) - **/ g_object_class_install_property ( object_class, PROP_METHOD, - g_param_spec_string (SOUP_MESSAGE_METHOD, + g_param_spec_string ("method", "Method", "The message's HTTP method", SOUP_METHOD_GET, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_MESSAGE_URI: - * - * Alias for the #SoupMessage:uri property. (The message's - * #SoupURI.) - **/ g_object_class_install_property ( object_class, PROP_URI, - g_param_spec_boxed (SOUP_MESSAGE_URI, + g_param_spec_boxed ("uri", "URI", "The message's Request-URI", SOUP_TYPE_URI, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_MESSAGE_HTTP_VERSION: - * - * Alias for the #SoupMessage:http-version property. (The - * message's #SoupHTTPVersion.) - **/ g_object_class_install_property ( object_class, PROP_HTTP_VERSION, - g_param_spec_enum (SOUP_MESSAGE_HTTP_VERSION, + g_param_spec_enum ("http-version", "HTTP Version", "The HTTP protocol version to use", SOUP_TYPE_HTTP_VERSION, SOUP_HTTP_1_1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_MESSAGE_FLAGS: - * - * Alias for the #SoupMessage:flags property. (The message's - * #SoupMessageFlags.) - **/ g_object_class_install_property ( object_class, PROP_FLAGS, - g_param_spec_flags (SOUP_MESSAGE_FLAGS, + g_param_spec_flags ("flags", "Flags", "Various message options", SOUP_TYPE_MESSAGE_FLAGS, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_MESSAGE_STATUS_CODE: - * - * Alias for the #SoupMessage:status-code property. (The - * message's HTTP response status code.) - **/ g_object_class_install_property ( object_class, PROP_STATUS_CODE, - g_param_spec_uint (SOUP_MESSAGE_STATUS_CODE, + g_param_spec_uint ("status-code", "Status code", "The HTTP response status code", 0, 999, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_MESSAGE_REASON_PHRASE: - * - * Alias for the #SoupMessage:reason-phrase property. (The - * message's HTTP response reason phrase.) - **/ g_object_class_install_property ( object_class, PROP_REASON_PHRASE, - g_param_spec_string (SOUP_MESSAGE_REASON_PHRASE, + g_param_spec_string ("reason-phrase", "Reason phrase", "The HTTP response reason phrase", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_MESSAGE_FIRST_PARTY: - * - * Alias for the #SoupMessage:first-party property. (The - * #SoupURI loaded in the application when the message was - * queued.) - * - * Since: 2.30 - **/ - /** * SoupMessage:first-party: * * The #SoupURI loaded in the application when the message was @@ -620,7 +575,7 @@ soup_message_class_init (SoupMessageClass *message_class) */ g_object_class_install_property ( object_class, PROP_FIRST_PARTY, - g_param_spec_boxed (SOUP_MESSAGE_FIRST_PARTY, + g_param_spec_boxed ("first-party", "First party", "The URI loaded in the application when the message was requested.", SOUP_TYPE_URI, @@ -635,7 +590,7 @@ soup_message_class_init (SoupMessageClass *message_class) */ g_object_class_install_property ( object_class, PROP_SITE_FOR_COOKIES, - g_param_spec_boxed (SOUP_MESSAGE_SITE_FOR_COOKIES, + g_param_spec_boxed ("site-for-cookies", "Site for cookies", "The URI for the site to compare cookies against", SOUP_TYPE_URI, @@ -649,48 +604,28 @@ soup_message_class_init (SoupMessageClass *message_class) */ g_object_class_install_property ( object_class, PROP_IS_TOP_LEVEL_NAVIGATION, - g_param_spec_boolean (SOUP_MESSAGE_IS_TOP_LEVEL_NAVIGATION, + g_param_spec_boolean ("is-top-level-navigation", "Is top-level navigation", "If the current messsage is navigating between top-levels", FALSE, G_PARAM_READWRITE)); - /** - * SOUP_MESSAGE_REQUEST_HEADERS: - * - * Alias for the #SoupMessage:request-headers property. (The - * message's HTTP request headers.) - **/ g_object_class_install_property ( object_class, PROP_REQUEST_HEADERS, - g_param_spec_boxed (SOUP_MESSAGE_REQUEST_HEADERS, + g_param_spec_boxed ("request-headers", "Request Headers", "The HTTP request headers", SOUP_TYPE_MESSAGE_HEADERS, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_MESSAGE_RESPONSE_HEADERS: - * - * Alias for the #SoupMessage:response-headers property. (The - * message's HTTP response headers.) - **/ g_object_class_install_property ( object_class, PROP_RESPONSE_HEADERS, - g_param_spec_boxed (SOUP_MESSAGE_RESPONSE_HEADERS, + g_param_spec_boxed ("response-headers", "Response Headers", "The HTTP response headers", SOUP_TYPE_MESSAGE_HEADERS, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_MESSAGE_TLS_CERTIFICATE: - * - * Alias for the #SoupMessage:tls-certificate property. (The - * TLS certificate associated with the message, if any.) - * - * Since: 2.34 - **/ - /** * SoupMessage:tls-certificate: * * The #GTlsCertificate associated with the message @@ -699,21 +634,13 @@ soup_message_class_init (SoupMessageClass *message_class) */ g_object_class_install_property ( object_class, PROP_TLS_CERTIFICATE, - g_param_spec_object (SOUP_MESSAGE_TLS_CERTIFICATE, + g_param_spec_object ("tls-certificate", "TLS Certificate", "The TLS certificate associated with the message", G_TYPE_TLS_CERTIFICATE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_MESSAGE_TLS_ERRORS: - * - * Alias for the #SoupMessage:tls-errors property. (The - * verification errors on #SoupMessage:tls-certificate.) - * - * Since: 2.34 - **/ - /** * SoupMessage:tls-errors: * * The verification errors on #SoupMessage:tls-certificate @@ -722,14 +649,14 @@ soup_message_class_init (SoupMessageClass *message_class) */ g_object_class_install_property ( object_class, PROP_TLS_ERRORS, - g_param_spec_flags (SOUP_MESSAGE_TLS_ERRORS, + g_param_spec_flags ("tls-errors", "TLS Errors", "The verification errors on the message's TLS certificate", G_TYPE_TLS_CERTIFICATE_FLAGS, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_MESSAGE_PRIORITY: + SoupMessage:priority: * * Sets the priority of the #SoupMessage. See * soup_message_set_priority() for further details. @@ -738,7 +665,7 @@ soup_message_class_init (SoupMessageClass *message_class) **/ g_object_class_install_property ( object_class, PROP_PRIORITY, - g_param_spec_enum (SOUP_MESSAGE_PRIORITY, + g_param_spec_enum ("priority", "Priority", "The priority of the message", SOUP_TYPE_MESSAGE_PRIORITY, @@ -793,8 +720,8 @@ SoupMessage * soup_message_new_from_uri (const char *method, SoupURI *uri) { return g_object_new (SOUP_TYPE_MESSAGE, - SOUP_MESSAGE_METHOD, method, - SOUP_MESSAGE_URI, uri, + "method", method, + "uri", uri, NULL); } @@ -1154,12 +1081,12 @@ soup_message_cleanup_response (SoupMessage *msg) } priv->http_version = priv->orig_http_version; - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_STATUS_CODE); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_REASON_PHRASE); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_HTTP_VERSION); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_FLAGS); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_TLS_CERTIFICATE); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_TLS_ERRORS); + g_object_notify (G_OBJECT (msg), "status-code"); + g_object_notify (G_OBJECT (msg), "reason-phrase"); + g_object_notify (G_OBJECT (msg), "http-version"); + g_object_notify (G_OBJECT (msg), "flags"); + g_object_notify (G_OBJECT (msg), "tls-certificate"); + g_object_notify (G_OBJECT (msg), "tls-errors"); } /** @@ -1216,7 +1143,7 @@ soup_message_set_flags (SoupMessage *msg, SoupMessageFlags flags) priv = soup_message_get_instance_private (msg); priv->msg_flags = flags; - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_FLAGS); + g_object_notify (G_OBJECT (msg), "flags"); } /** @@ -1259,7 +1186,7 @@ soup_message_set_http_version (SoupMessage *msg, SoupHTTPVersion version) priv->http_version = version; if (msg->status_code == SOUP_STATUS_NONE) priv->orig_http_version = version; - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_HTTP_VERSION); + g_object_notify (G_OBJECT (msg), "http-version"); } /** @@ -1351,7 +1278,7 @@ soup_message_set_uri (SoupMessage *msg, SoupURI *uri) soup_uri_free (priv->uri); priv->uri = soup_uri_copy (uri); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_URI); + g_object_notify (G_OBJECT (msg), "uri"); } /** @@ -1392,8 +1319,8 @@ soup_message_set_status (SoupMessage *msg, guint status_code) msg->status_code = status_code; msg->reason_phrase = g_strdup (soup_status_get_phrase (status_code)); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_STATUS_CODE); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_REASON_PHRASE); + g_object_notify (G_OBJECT (msg), "status-code"); + g_object_notify (G_OBJECT (msg), "reason-phrase"); } /** @@ -1417,8 +1344,8 @@ soup_message_set_status_full (SoupMessage *msg, msg->status_code = status_code; msg->reason_phrase = g_strdup (reason_phrase); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_STATUS_CODE); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_REASON_PHRASE); + g_object_notify (G_OBJECT (msg), "status-code"); + g_object_notify (G_OBJECT (msg), "reason-phrase"); } /** @@ -1570,7 +1497,7 @@ soup_message_set_first_party (SoupMessage *msg, } priv->first_party = soup_uri_copy (first_party); - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_FIRST_PARTY); + g_object_notify (G_OBJECT (msg), "first-party"); } /** @@ -1631,7 +1558,7 @@ soup_message_set_site_for_cookies (SoupMessage *msg, } priv->site_for_cookies = site_for_cookies ? soup_uri_copy (site_for_cookies) : NULL; - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_SITE_FOR_COOKIES); + g_object_notify (G_OBJECT (msg), "site-for-cookies"); } /** @@ -1658,7 +1585,7 @@ soup_message_set_is_top_level_navigation (SoupMessage *msg, return; priv->is_top_level_navigation = is_top_level_navigation; - g_object_notify (G_OBJECT (msg), SOUP_MESSAGE_IS_TOP_LEVEL_NAVIGATION); + g_object_notify (G_OBJECT (msg), "is-top-level-navigation"); } /** @@ -1689,19 +1616,19 @@ soup_message_set_https_status (SoupMessage *msg, SoupConnection *conn) GTlsCertificateFlags errors; g_object_get (sock, - SOUP_SOCKET_TLS_CERTIFICATE, &certificate, - SOUP_SOCKET_TLS_ERRORS, &errors, + "tls-certificate", &certificate, + "tls-errors", &errors, NULL); g_object_set (msg, - SOUP_MESSAGE_TLS_CERTIFICATE, certificate, - SOUP_MESSAGE_TLS_ERRORS, errors, + "tls-certificate", certificate, + "tls-errors", errors, NULL); if (certificate) g_object_unref (certificate); } else { g_object_set (msg, - SOUP_MESSAGE_TLS_CERTIFICATE, NULL, - SOUP_MESSAGE_TLS_ERRORS, 0, + "tls-certificate", NULL, + "tls-errors", 0, NULL); } } @@ -1785,7 +1712,7 @@ soup_message_set_priority (SoupMessage *msg, { g_return_if_fail (SOUP_IS_MESSAGE (msg)); - g_object_set (msg, SOUP_MESSAGE_PRIORITY, priority, NULL); + g_object_set (msg, "priority", priority, NULL); } /** diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h index e30e9049..588c7911 100644 --- a/libsoup/soup-message.h +++ b/libsoup/soup-message.h @@ -56,26 +56,6 @@ typedef struct { SOUP_AVAILABLE_IN_2_4 GType soup_message_get_type (void); -#define SOUP_MESSAGE_METHOD "method" -#define SOUP_MESSAGE_URI "uri" -#define SOUP_MESSAGE_HTTP_VERSION "http-version" -#define SOUP_MESSAGE_FLAGS "flags" -#define SOUP_MESSAGE_SERVER_SIDE "server-side" -#define SOUP_MESSAGE_STATUS_CODE "status-code" -#define SOUP_MESSAGE_REASON_PHRASE "reason-phrase" -#define SOUP_MESSAGE_FIRST_PARTY "first-party" -#define SOUP_MESSAGE_SITE_FOR_COOKIES "site-for-cookies" -#define SOUP_MESSAGE_REQUEST_BODY "request-body" -#define SOUP_MESSAGE_REQUEST_BODY_DATA "request-body-data" -#define SOUP_MESSAGE_REQUEST_HEADERS "request-headers" -#define SOUP_MESSAGE_RESPONSE_BODY "response-body" -#define SOUP_MESSAGE_RESPONSE_BODY_DATA "response-body-data" -#define SOUP_MESSAGE_RESPONSE_HEADERS "response-headers" -#define SOUP_MESSAGE_TLS_CERTIFICATE "tls-certificate" -#define SOUP_MESSAGE_TLS_ERRORS "tls-errors" -#define SOUP_MESSAGE_PRIORITY "priority" -#define SOUP_MESSAGE_IS_TOP_LEVEL_NAVIGATION "is-top-level-navigation" - SOUP_AVAILABLE_IN_2_4 SoupMessage *soup_message_new (const char *method, const char *uri_string); diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index 2cd30303..b7394ed8 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -893,7 +893,7 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg) if (SOUP_SESSION_WOULD_REDIRECT_AS_GET (session, msg)) { if (msg->method != SOUP_METHOD_HEAD) { g_object_set (msg, - SOUP_MESSAGE_METHOD, SOUP_METHOD_GET, + "method", SOUP_METHOD_GET, NULL); } soup_message_set_request_body (msg, NULL, NULL, 0); @@ -1561,9 +1561,9 @@ get_connection_for_host (SoupSession *session, ensure_socket_props (session); conn = g_object_new (SOUP_TYPE_CONNECTION, - SOUP_CONNECTION_REMOTE_URI, host->uri, - SOUP_CONNECTION_SSL, soup_uri_is_https (host->uri, priv->https_aliases), - SOUP_CONNECTION_SOCKET_PROPERTIES, priv->socket_props, + "remote-uri", host->uri, + "ssl", soup_uri_is_https (host->uri, priv->https_aliases), + "socket-properties", priv->socket_props, NULL); g_signal_connect (conn, "disconnected", @@ -2079,7 +2079,7 @@ soup_session_abort (SoupSession *session) * * Adds @feature's functionality to @session. You can also add a * feature to the session at construct time by using the - * %SOUP_SESSION_ADD_FEATURE property. + * SoupSession:add-feature property. * * See the main #SoupSession documentation for information on what * features are present in sessions by default. @@ -2115,7 +2115,7 @@ soup_session_add_feature (SoupSession *session, SoupSessionFeature *feature) * a "subfeature". This can be used to add new #SoupAuth types, for instance. * * You can also add a feature to the session at construct time by - * using the %SOUP_SESSION_ADD_FEATURE_BY_TYPE property. + * using the SoupSession:add-feature-by-type property. * * See the main #SoupSession documentation for information on what * features are present in sessions by default. @@ -2181,7 +2181,7 @@ soup_session_remove_feature (SoupSession *session, SoupSessionFeature *feature) * Removes all features of type @feature_type (or any subclass of * @feature_type) from @session. You can also remove standard features * from the session at construct time by using the - * %SOUP_SESSION_REMOVE_FEATURE_BY_TYPE property. + * SoupSession:remove-feature-by-type property. * * Since: 2.24 **/ @@ -2484,27 +2484,17 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.42 */ - /** - * SOUP_SESSION_PROXY_RESOLVER: - * - * Alias for the #SoupSession:proxy-resolver property, qv. - **/ g_object_class_install_property ( object_class, PROP_PROXY_RESOLVER, - g_param_spec_object (SOUP_SESSION_PROXY_RESOLVER, + g_param_spec_object ("proxy-resolver", "Proxy Resolver", "The GProxyResolver to use for this session", G_TYPE_PROXY_RESOLVER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SESSION_MAX_CONNS: - * - * Alias for the #SoupSession:max-conns property, qv. - **/ g_object_class_install_property ( object_class, PROP_MAX_CONNS, - g_param_spec_int (SOUP_SESSION_MAX_CONNS, + g_param_spec_int ("max-conns", "Max Connection Count", "The maximum number of connections that the session can open at once", 1, @@ -2512,14 +2502,9 @@ soup_session_class_init (SoupSessionClass *session_class) SOUP_SESSION_MAX_CONNS_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SESSION_MAX_CONNS_PER_HOST: - * - * Alias for the #SoupSession:max-conns-per-host property, qv. - **/ g_object_class_install_property ( object_class, PROP_MAX_CONNS_PER_HOST, - g_param_spec_int (SOUP_SESSION_MAX_CONNS_PER_HOST, + g_param_spec_int ("max-conns-per-host", "Max Per-Host Connection Count", "The maximum number of connections that the session can open at once to a given host", 1, @@ -2541,16 +2526,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.24 **/ - /** - * SOUP_SESSION_IDLE_TIMEOUT: - * - * Alias for the #SoupSession:idle-timeout property, qv. - * - * Since: 2.24 - **/ g_object_class_install_property ( object_class, PROP_IDLE_TIMEOUT, - g_param_spec_uint (SOUP_SESSION_IDLE_TIMEOUT, + g_param_spec_uint ("idle-timeout", "Idle Timeout", "Connection lifetime when idle", 0, G_MAXUINT, 60, @@ -2558,14 +2536,6 @@ soup_session_class_init (SoupSessionClass *session_class) G_PARAM_STATIC_STRINGS)); /** - * SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE: - * - * Alias for the #SoupSession:ssl-use-system-ca-file property, - * qv. - * - * Since: 2.38 - **/ - /** * SoupSession:ssl-use-system-ca-file: * * Setting this to %TRUE is equivalent to setting @@ -2584,20 +2554,13 @@ soup_session_class_init (SoupSessionClass *session_class) **/ g_object_class_install_property ( object_class, PROP_SSL_USE_SYSTEM_CA_FILE, - g_param_spec_boolean (SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, + g_param_spec_boolean ("ssl-use-system-ca-file", "Use system CA file", "Use the system certificate database", TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_SESSION_TLS_DATABASE: - * - * Alias for the #SoupSession:tls-database property, qv. - * - * Since: 2.38 - **/ - /** * SoupSession:tls-database: * * Sets the #GTlsDatabase to use for validating SSL/TLS @@ -2615,20 +2578,13 @@ soup_session_class_init (SoupSessionClass *session_class) **/ g_object_class_install_property ( object_class, PROP_TLS_DATABASE, - g_param_spec_object (SOUP_SESSION_TLS_DATABASE, + g_param_spec_object ("tls-database", "TLS Database", "TLS database to use", G_TYPE_TLS_DATABASE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_SESSION_SSL_STRICT: - * - * Alias for the #SoupSession:ssl-strict property, qv. - * - * Since: 2.30 - **/ - /** * SoupSession:ssl-strict: * * Normally, if #SoupSession:tls-database is set (including if @@ -2654,7 +2610,7 @@ soup_session_class_init (SoupSessionClass *session_class) */ g_object_class_install_property ( object_class, PROP_SSL_STRICT, - g_param_spec_boolean (SOUP_SESSION_SSL_STRICT, + g_param_spec_boolean ("ssl-strict", "Strictly validate SSL certificates", "Whether certificate errors should be considered a connection error", TRUE, @@ -2678,14 +2634,9 @@ soup_session_class_init (SoupSessionClass *session_class) * the length of time that idle persistent connections will be * kept open). */ - /** - * SOUP_SESSION_TIMEOUT: - * - * Alias for the #SoupSession:timeout property, qv. - **/ g_object_class_install_property ( object_class, PROP_TIMEOUT, - g_param_spec_uint (SOUP_SESSION_TIMEOUT, + g_param_spec_uint ("timeout", "Timeout value", "Value in seconds to timeout a blocking I/O", 0, G_MAXUINT, 0, @@ -2719,14 +2670,9 @@ soup_session_class_init (SoupSessionClass *session_class) * (eg, "<literal>libsoup/2.3.2</literal>") to the end of the * header for you. **/ - /** - * SOUP_SESSION_USER_AGENT: - * - * Alias for the #SoupSession:user-agent property, qv. - **/ g_object_class_install_property ( object_class, PROP_USER_AGENT, - g_param_spec_string (SOUP_SESSION_USER_AGENT, + g_param_spec_string ("user-agent", "User-Agent string", "User-Agent string", NULL, @@ -2744,16 +2690,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.30 **/ - /** - * SOUP_SESSION_ACCEPT_LANGUAGE: - * - * Alias for the #SoupSession:accept-language property, qv. - * - * Since: 2.30 - **/ g_object_class_install_property ( object_class, PROP_ACCEPT_LANGUAGE, - g_param_spec_string (SOUP_SESSION_ACCEPT_LANGUAGE, + g_param_spec_string ("accept-language", "Accept-Language string", "Accept-Language string", NULL, @@ -2772,16 +2711,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.30 **/ - /** - * SOUP_SESSION_ACCEPT_LANGUAGE_AUTO: - * - * Alias for the #SoupSession:accept-language-auto property, qv. - * - * Since: 2.30 - **/ g_object_class_install_property ( object_class, PROP_ACCEPT_LANGUAGE_AUTO, - g_param_spec_boolean (SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, + g_param_spec_boolean ("accept-language-auto", "Accept-Language automatic mode", "Accept-Language automatic mode", FALSE, @@ -2796,16 +2728,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.24 **/ - /** - * SOUP_SESSION_ADD_FEATURE: (skip) - * - * Alias for the #SoupSession:add-feature property, qv. - * - * Since: 2.24 - **/ g_object_class_install_property ( object_class, PROP_ADD_FEATURE, - g_param_spec_object (SOUP_SESSION_ADD_FEATURE, + g_param_spec_object ("add-feature", "Add Feature", "Add a feature object to the session", SOUP_TYPE_SESSION_FEATURE, @@ -2819,16 +2744,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.24 **/ - /** - * SOUP_SESSION_ADD_FEATURE_BY_TYPE: (skip) - * - * Alias for the #SoupSession:add-feature-by-type property, qv. - * - * Since: 2.24 - **/ g_object_class_install_property ( object_class, PROP_ADD_FEATURE_BY_TYPE, - g_param_spec_gtype (SOUP_SESSION_ADD_FEATURE_BY_TYPE, + g_param_spec_gtype ("add-feature-by-type", "Add Feature By Type", "Add a feature object of the given type to the session", G_TYPE_OBJECT, @@ -2842,17 +2760,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.24 **/ - /** - * SOUP_SESSION_REMOVE_FEATURE_BY_TYPE: (skip) - * - * Alias for the #SoupSession:remove-feature-by-type property, - * qv. - * - * Since: 2.24 - **/ g_object_class_install_property ( object_class, PROP_REMOVE_FEATURE_BY_TYPE, - g_param_spec_gtype (SOUP_SESSION_REMOVE_FEATURE_BY_TYPE, + g_param_spec_gtype ("remove-feature-by-type", "Remove Feature By Type", "Remove features of the given type from the session", G_TYPE_OBJECT, @@ -2874,16 +2784,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.38 */ - /** - * SOUP_SESSION_HTTP_ALIASES: - * - * Alias for the #SoupSession:http-aliases property, qv. - * - * Since: 2.38 - */ g_object_class_install_property ( object_class, PROP_HTTP_ALIASES, - g_param_spec_boxed (SOUP_SESSION_HTTP_ALIASES, + g_param_spec_boxed ("http-aliases", "http aliases", "URI schemes that are considered aliases for 'http'", G_TYPE_STRV, @@ -2901,16 +2804,9 @@ soup_session_class_init (SoupSessionClass *session_class) * * Since: 2.38 */ - /** - * SOUP_SESSION_HTTPS_ALIASES: - * - * Alias for the #SoupSession:https-aliases property, qv. - * - * Since: 2.38 - **/ g_object_class_install_property ( object_class, PROP_HTTPS_ALIASES, - g_param_spec_boxed (SOUP_SESSION_HTTPS_ALIASES, + g_param_spec_boxed ("https-aliases", "https aliases", "URI schemes that are considered aliases for 'https'", G_TYPE_STRV, @@ -2918,13 +2814,6 @@ soup_session_class_init (SoupSessionClass *session_class) G_PARAM_STATIC_STRINGS)); /** - * SOUP_SESSION_LOCAL_ADDRESS: - * - * Alias for the #SoupSession:local-address property, qv. - * - * Since: 2.42 - **/ - /** * SoupSession:local-address: * * Sets the #GInetSocketAddress to use for the client side of @@ -2937,7 +2826,7 @@ soup_session_class_init (SoupSessionClass *session_class) **/ g_object_class_install_property ( object_class, PROP_LOCAL_ADDRESS, - g_param_spec_object (SOUP_SESSION_LOCAL_ADDRESS, + g_param_spec_object ("local-address", "Local address", "Address of local end of socket", G_TYPE_INET_SOCKET_ADDRESS, @@ -2945,13 +2834,6 @@ soup_session_class_init (SoupSessionClass *session_class) G_PARAM_STATIC_STRINGS)); /** - * SOUP_SESSION_TLS_INTERACTION: - * - * Alias for the #SoupSession:tls-interaction property, qv. - * - * Since: 2.48 - **/ - /** * SoupSession:tls-interaction: * * A #GTlsInteraction object that will be passed on to any @@ -2962,7 +2844,7 @@ soup_session_class_init (SoupSessionClass *session_class) **/ g_object_class_install_property ( object_class, PROP_TLS_INTERACTION, - g_param_spec_object (SOUP_SESSION_TLS_INTERACTION, + g_param_spec_object ("tls-interaction", "TLS Interaction", "TLS interaction to use", G_TYPE_TLS_INTERACTION, @@ -4111,7 +3993,7 @@ steal_connection (SoupSession *session, sock = soup_connection_get_socket (conn); g_object_set (sock, - SOUP_SOCKET_TIMEOUT, 0, + "timeout", 0, NULL); if (item->connect_only) diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h index 9581e023..8117c3a4 100644 --- a/libsoup/soup-session.h +++ b/libsoup/soup-session.h @@ -15,25 +15,6 @@ G_BEGIN_DECLS SOUP_AVAILABLE_IN_2_42 G_DECLARE_FINAL_TYPE (SoupSession, soup_session, SOUP, SESSION, GObject) -#define SOUP_SESSION_LOCAL_ADDRESS "local-address" -#define SOUP_SESSION_PROXY_RESOLVER "proxy-resolver" -#define SOUP_SESSION_MAX_CONNS "max-conns" -#define SOUP_SESSION_MAX_CONNS_PER_HOST "max-conns-per-host" -#define SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE "ssl-use-system-ca-file" -#define SOUP_SESSION_TLS_DATABASE "tls-database" -#define SOUP_SESSION_SSL_STRICT "ssl-strict" -#define SOUP_SESSION_TLS_INTERACTION "tls-interaction" -#define SOUP_SESSION_TIMEOUT "timeout" -#define SOUP_SESSION_USER_AGENT "user-agent" -#define SOUP_SESSION_ACCEPT_LANGUAGE "accept-language" -#define SOUP_SESSION_ACCEPT_LANGUAGE_AUTO "accept-language-auto" -#define SOUP_SESSION_IDLE_TIMEOUT "idle-timeout" -#define SOUP_SESSION_ADD_FEATURE "add-feature" -#define SOUP_SESSION_ADD_FEATURE_BY_TYPE "add-feature-by-type" -#define SOUP_SESSION_REMOVE_FEATURE_BY_TYPE "remove-feature-by-type" -#define SOUP_SESSION_HTTP_ALIASES "http-aliases" -#define SOUP_SESSION_HTTPS_ALIASES "https-aliases" - SOUP_AVAILABLE_IN_ALL GQuark soup_session_error_quark (void); #define SOUP_SESSION_ERROR soup_session_error_quark () diff --git a/libsoup/soup-socket-private.h b/libsoup/soup-socket-private.h index 9384de58..700e2b25 100644 --- a/libsoup/soup-socket-private.h +++ b/libsoup/soup-socket-private.h @@ -8,11 +8,6 @@ #include "soup-socket.h" -#define SOUP_SOCKET_SOCKET_PROPERTIES "socket-properties" -#define SOUP_SOCKET_GSOCKET "gsocket" -#define SOUP_SOCKET_IOSTREAM "iostream" -#define SOUP_SOCKET_IPV6_ONLY "ipv6-only" - gboolean soup_socket_connect_sync_internal (SoupSocket *sock, GCancellable *cancellable, GError **error); diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c index 3f974ff3..9b471d39 100644 --- a/libsoup/soup-socket.c +++ b/libsoup/soup-socket.c @@ -493,7 +493,7 @@ soup_socket_class_init (SoupSocketClass *socket_class) /* properties */ g_object_class_install_property ( object_class, PROP_GSOCKET, - g_param_spec_object (SOUP_SOCKET_GSOCKET, + g_param_spec_object ("gsocket", "GSocket", "The socket's underlying GSocket", G_TYPE_SOCKET, @@ -501,51 +501,34 @@ soup_socket_class_init (SoupSocketClass *socket_class) G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, PROP_IOSTREAM, - g_param_spec_object (SOUP_SOCKET_IOSTREAM, + g_param_spec_object ("iostream", "GIOStream", "The socket's underlying GIOStream", G_TYPE_IO_STREAM, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_LOCAL_ADDRESS: - * - * Alias for the #SoupSocket:local-address property. (Address - * of local end of socket.) - **/ g_object_class_install_property ( object_class, PROP_LOCAL_ADDRESS, - g_param_spec_object (SOUP_SOCKET_LOCAL_ADDRESS, + g_param_spec_object ("local-address", "Local address", "Address of local end of socket", G_TYPE_INET_SOCKET_ADDRESS, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_REMOTE_ADDRESS: - * - * Alias for the #SoupSocket:remote-address property. (Address - * of remote end of socket.) - **/ + g_object_class_install_property ( object_class, PROP_REMOTE_ADDRESS, - g_param_spec_object (SOUP_SOCKET_REMOTE_ADDRESS, + g_param_spec_object ("remote-address", "Remote address", "Address of remote end of socket", G_TYPE_SOCKET_ADDRESS, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_REMOTE_CONNECTABLE: - * - * Alias for the #SoupSocket:remote-connectable property. (Address - * to connect to.) - **/ g_object_class_install_property ( object_class, PROP_REMOTE_CONNECTABLE, - g_param_spec_object (SOUP_SOCKET_REMOTE_CONNECTABLE, + g_param_spec_object ("remote-connectable", "Remote address", "Address to connect to", G_TYPE_SOCKET_CONNECTABLE, @@ -575,15 +558,9 @@ soup_socket_class_init (SoupSocketClass *socket_class) * simply never return %SOUP_SOCKET_WOULD_BLOCK, and so the * code that handles that case just won't get used for them. **/ - /** - * SOUP_SOCKET_FLAG_NONBLOCKING: - * - * Alias for the #SoupSocket:non-blocking property. (Whether - * or not the socket uses non-blocking I/O.) - **/ g_object_class_install_property ( object_class, PROP_NON_BLOCKING, - g_param_spec_boolean (SOUP_SOCKET_FLAG_NONBLOCKING, + g_param_spec_boolean ("non-blocking", "Non-blocking", "Whether or not the socket uses non-blocking I/O", TRUE, @@ -591,18 +568,13 @@ soup_socket_class_init (SoupSocketClass *socket_class) G_PARAM_STATIC_STRINGS)); g_object_class_install_property ( object_class, PROP_IPV6_ONLY, - g_param_spec_boolean (SOUP_SOCKET_IPV6_ONLY, + g_param_spec_boolean ("ipv6-only", "IPv6 only", "IPv6 only", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_SOCKET_IS_SERVER: - * - * Alias for the #SoupSocket:is-server property, qv. - **/ - /** * SoupSocket:is-server: * * Whether or not the socket is a server socket. @@ -613,79 +585,54 @@ soup_socket_class_init (SoupSocketClass *socket_class) **/ g_object_class_install_property ( object_class, PROP_IS_SERVER, - g_param_spec_boolean (SOUP_SOCKET_IS_SERVER, + g_param_spec_boolean ("is-server", "Server", "Whether or not the socket is a server socket", FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_SSL_CREDENTIALS: - * - * Alias for the #SoupSocket:ssl-creds property. - * (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, + g_param_spec_pointer ("ssl-creds", "SSL credentials", "SSL credential information, passed from the session to the SSL implementation", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_SSL_STRICT: - * - * Alias for the #SoupSocket:ssl-strict property. - **/ + g_object_class_install_property ( object_class, PROP_SSL_STRICT, - g_param_spec_boolean (SOUP_SOCKET_SSL_STRICT, + g_param_spec_boolean ("ssl-strict", "Strictly validate SSL certificates", "Whether certificate errors should be considered a connection error", TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_SSL_FALLBACK: - * - * Alias for the #SoupSocket:ssl-fallback property. - **/ + g_object_class_install_property ( object_class, PROP_SSL_FALLBACK, - g_param_spec_boolean (SOUP_SOCKET_SSL_FALLBACK, + g_param_spec_boolean ("ssl-fallback", "SSLv3 fallback", "Use SSLv3 instead of TLS (client-side only)", FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_TRUSTED_CERTIFICATE: - * - * Alias for the #SoupSocket:trusted-certificate - * property. - **/ + g_object_class_install_property ( object_class, PROP_TRUSTED_CERTIFICATE, - g_param_spec_boolean (SOUP_SOCKET_TRUSTED_CERTIFICATE, + g_param_spec_boolean ("trusted-certificate", "Trusted Certificate", "Whether the server certificate is trusted, if this is an SSL socket", FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** - * SOUP_SOCKET_TIMEOUT: - * - * Alias for the #SoupSocket:timeout property. (The timeout - * in seconds for blocking socket I/O operations.) - **/ g_object_class_install_property ( object_class, PROP_TIMEOUT, - g_param_spec_uint (SOUP_SOCKET_TIMEOUT, + g_param_spec_uint ("timeout", "Timeout value", "Value in seconds to timeout a blocking I/O", 0, G_MAXUINT, 0, @@ -693,10 +640,11 @@ soup_socket_class_init (SoupSocketClass *socket_class) G_PARAM_STATIC_STRINGS)); /** - * SOUP_SOCKET_TLS_CERTIFICATE: + * SoupSocket:tls-certificate: * - * Alias for the #SoupSocket:tls-certificate - * property. Note that this property's value is only useful + * The peer's TLS certificate. + * + * Note that this property's value is only useful * if the socket is for a TLS connection, and only reliable * after some data has been transferred to or from it. * @@ -704,17 +652,18 @@ soup_socket_class_init (SoupSocketClass *socket_class) **/ g_object_class_install_property ( object_class, PROP_TLS_CERTIFICATE, - g_param_spec_object (SOUP_SOCKET_TLS_CERTIFICATE, + g_param_spec_object ("tls-certificate", "TLS certificate", "The peer's TLS certificate", G_TYPE_TLS_CERTIFICATE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * SOUP_SOCKET_TLS_ERRORS: + * SoupSocket:tls-errors: * - * Alias for the #SoupSocket:tls-errors - * property. Note that this property's value is only useful + * Errors with the peer's TLS certificate. + * + * Note that this property's value is only useful * if the socket is for a TLS connection, and only reliable * after some data has been transferred to or from it. * @@ -722,7 +671,7 @@ soup_socket_class_init (SoupSocketClass *socket_class) **/ g_object_class_install_property ( object_class, PROP_TLS_ERRORS, - g_param_spec_flags (SOUP_SOCKET_TLS_ERRORS, + g_param_spec_flags ("tls-errors", "TLS errors", "Errors with the peer's TLS certificate", G_TYPE_TLS_CERTIFICATE_FLAGS, 0, @@ -731,7 +680,7 @@ soup_socket_class_init (SoupSocketClass *socket_class) g_object_class_install_property ( object_class, PROP_SOCKET_PROPERTIES, - g_param_spec_boxed (SOUP_SOCKET_SOCKET_PROPERTIES, + g_param_spec_boxed ("socket-properties", "Socket properties", "Socket properties", SOUP_TYPE_SOCKET_PROPERTIES, diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h index 3775e6ad..7d944f66 100644 --- a/libsoup/soup-socket.h +++ b/libsoup/soup-socket.h @@ -12,19 +12,6 @@ G_BEGIN_DECLS #define SOUP_TYPE_SOCKET (soup_socket_get_type ()) G_DECLARE_FINAL_TYPE (SoupSocket, soup_socket, SOUP, SOCKET, GObject) -#define SOUP_SOCKET_LOCAL_ADDRESS "local-address" -#define SOUP_SOCKET_REMOTE_ADDRESS "remote-address" -#define SOUP_SOCKET_REMOTE_CONNECTABLE "remote-connectable" -#define SOUP_SOCKET_FLAG_NONBLOCKING "non-blocking" -#define SOUP_SOCKET_IS_SERVER "is-server" -#define SOUP_SOCKET_SSL_CREDENTIALS "ssl-creds" -#define SOUP_SOCKET_SSL_STRICT "ssl-strict" -#define SOUP_SOCKET_SSL_FALLBACK "ssl-fallback" -#define SOUP_SOCKET_TRUSTED_CERTIFICATE "trusted-certificate" -#define SOUP_SOCKET_TIMEOUT "timeout" -#define SOUP_SOCKET_TLS_CERTIFICATE "tls-certificate" -#define SOUP_SOCKET_TLS_ERRORS "tls-errors" - typedef void (*SoupSocketCallback) (SoupSocket *sock, guint status, gpointer user_data); diff --git a/tests/auth-test.c b/tests/auth-test.c index 0bacbb80..2b10b310 100644 --- a/tests/auth-test.c +++ b/tests/auth-test.c @@ -896,16 +896,16 @@ do_select_auth_test (void) uri = soup_test_server_get_uri (server, "http", NULL); basic_auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "auth-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, server_basic_auth_callback, + "realm", "auth-test", + "add-path", "/", + "auth-callback", server_basic_auth_callback, NULL); soup_server_add_auth_domain (server, basic_auth_domain); digest_auth_domain = soup_auth_domain_digest_new ( - SOUP_AUTH_DOMAIN_REALM, "auth-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/", - SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK, server_digest_auth_callback, + "realm", "auth-test", + "add-path", "/", + "auth-callback", server_digest_auth_callback, NULL); soup_server_add_auth_domain (server, digest_auth_domain); @@ -1047,9 +1047,9 @@ do_auth_close_test (void) soup_uri_set_path (uri, "/close"); basic_auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "auth-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, server_basic_auth_callback, + "realm", "auth-test", + "add-path", "/", + "auth-callback", server_basic_auth_callback, NULL); soup_server_add_auth_domain (server, basic_auth_domain); g_object_unref (basic_auth_domain); @@ -1168,9 +1168,9 @@ do_disappearing_auth_test (void) uri = soup_test_server_get_uri (server, "http", NULL); auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "auth-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, server_basic_auth_callback, + "realm", "auth-test", + "add-path", "/", + "auth-callback", server_basic_auth_callback, NULL); soup_server_add_auth_domain (server, auth_domain); g_signal_connect (server, "request-read", diff --git a/tests/cache-test.c b/tests/cache-test.c index 454f0d4b..e03e146a 100644 --- a/tests/cache-test.c +++ b/tests/cache-test.c @@ -295,7 +295,7 @@ do_basics_test (gconstpointer data) debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, cache, + "add-feature", cache, NULL); g_signal_connect (session, "request-queued", @@ -489,7 +489,7 @@ do_cancel_test (gconstpointer data) debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, cache, + "add-feature", cache, NULL); g_signal_connect (session, "request-unqueued", G_CALLBACK (request_unqueued), NULL); @@ -522,7 +522,7 @@ do_cancel_test (gconstpointer data) soup_test_session_abort_unref (session); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, cache, + "add-feature", cache, NULL); g_signal_connect (session, "request-unqueued", G_CALLBACK (request_unqueued), NULL); @@ -583,7 +583,7 @@ do_refcounting_test (gconstpointer data) debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, cache, + "add-feature", cache, NULL); last_request_validated = last_request_hit_network = FALSE; @@ -638,7 +638,7 @@ do_headers_test (gconstpointer data) debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, cache, + "add-feature", cache, NULL); g_signal_connect (session, "request-queued", @@ -715,7 +715,7 @@ do_leaks_test (gconstpointer data) debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, cache, + "add-feature", cache, NULL); debug_printf (2, " Initial requests\n"); diff --git a/tests/connection-test.c b/tests/connection-test.c index 1546f1e3..ab02114b 100644 --- a/tests/connection-test.c +++ b/tests/connection-test.c @@ -541,7 +541,7 @@ do_max_conns_test (void) g_test_bug ("634422"); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_MAX_CONNS, MAX_CONNS, + "max-conns", MAX_CONNS, NULL); do_max_conns_test_for_session (session); soup_test_session_abort_unref (session); @@ -769,7 +769,7 @@ do_connection_state_test_for_session (SoupSession *session) resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL); g_object_set (G_OBJECT (session), - SOUP_SESSION_PROXY_RESOLVER, resolver, + "proxy-resolver", resolver, NULL); g_object_unref (resolver); @@ -908,7 +908,7 @@ do_connection_event_test_for_session (SoupSession *session) resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL); g_object_set (G_OBJECT (session), - SOUP_SESSION_PROXY_RESOLVER, resolver, + "proxy-resolver", resolver, NULL); g_object_unref (resolver); diff --git a/tests/continue-test.c b/tests/continue-test.c index 2b63b1b7..3d00619f 100644 --- a/tests/continue-test.c +++ b/tests/continue-test.c @@ -519,9 +519,9 @@ setup_server (void) soup_server_add_handler (server, NULL, server_callback, NULL, NULL); auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "continue-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/auth", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, auth_callback, + "realm", "continue-test", + "add-path", "/auth", + "auth-callback", auth_callback, NULL); soup_server_add_auth_domain (server, auth_domain); g_object_unref (auth_domain); diff --git a/tests/hsts-db-test.c b/tests/hsts-db-test.c index 2adc05b7..783f8fe4 100644 --- a/tests/hsts-db-test.c +++ b/tests/hsts-db-test.c @@ -113,7 +113,7 @@ hsts_db_session_new (void) SoupHSTSEnforcer *hsts_db = soup_hsts_enforcer_db_new (DB_FILE); SoupSession *session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, hsts_db, + "add-feature", hsts_db, NULL); g_signal_connect (session, "request-queued", G_CALLBACK (on_request_queued), NULL); g_object_unref (hsts_db); diff --git a/tests/hsts-test.c b/tests/hsts-test.c index 9bb36edf..2a87293b 100644 --- a/tests/hsts-test.c +++ b/tests/hsts-test.c @@ -160,11 +160,11 @@ hsts_session_new (SoupHSTSEnforcer *enforcer) if (enforcer) session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE, enforcer, + "add-feature", enforcer, NULL); else session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_HSTS_ENFORCER, + "add-feature-by-type", SOUP_TYPE_HSTS_ENFORCER, NULL); g_signal_connect (session, "request-queued", G_CALLBACK (on_request_queued), NULL); diff --git a/tests/misc-test.c b/tests/misc-test.c index 7dde71be..f270cadf 100644 --- a/tests/misc-test.c +++ b/tests/misc-test.c @@ -446,7 +446,7 @@ do_one_accept_language_test (const char *language, const char *expected_header) debug_printf (1, " LANGUAGE=%s\n", language); g_setenv ("LANGUAGE", language, TRUE); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, TRUE, + "accept-language-auto", TRUE, NULL); msg = soup_message_new_from_uri ("GET", base_uri); soup_test_session_send_message (session, msg); @@ -642,7 +642,7 @@ do_aliases_test (void) if (tls_available) { debug_printf (1, " foo-means-https\n"); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_HTTPS_ALIASES, aliases, + "https-aliases", aliases, NULL); do_aliases_test_for_session (session, "https"); soup_test_session_abort_unref (session); @@ -771,9 +771,9 @@ main (int argc, char **argv) base_uri = soup_test_server_get_uri (server, "http", NULL); auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "misc-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/auth", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, auth_callback, + "realm", "misc-test", + "add-path", "/auth", + "auth-callback", auth_callback, NULL); soup_server_add_auth_domain (server, auth_domain); g_object_unref (auth_domain); diff --git a/tests/ntlm-test.c b/tests/ntlm-test.c index c3d69c9b..d56c54bf 100644 --- a/tests/ntlm-test.c +++ b/tests/ntlm-test.c @@ -653,7 +653,7 @@ do_retrying_test (TestServer *ts, debug_printf (1, " /alice\n"); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_AUTH_NTLM, + "add-feature-by-type", SOUP_TYPE_AUTH_NTLM, NULL); g_signal_connect (session, "authenticate", G_CALLBACK (retry_test_authenticate), &retried); @@ -675,7 +675,7 @@ do_retrying_test (TestServer *ts, debug_printf (1, " /bob\n"); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_AUTH_NTLM, + "add-feature-by-type", SOUP_TYPE_AUTH_NTLM, NULL); g_signal_connect (session, "authenticate", G_CALLBACK (retry_test_authenticate), &retried); diff --git a/tests/proxy-test.c b/tests/proxy-test.c index 1f5e646a..f28cb3c5 100644 --- a/tests/proxy-test.c +++ b/tests/proxy-test.c @@ -94,8 +94,8 @@ test_url (const char *url, int proxy, guint expected, gboolean close) * connections/auth aren't cached between tests. */ session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, proxy_resolvers[proxy], - SOUP_SESSION_SSL_STRICT, FALSE, + "proxy-resolver", proxy_resolvers[proxy], + "ssl-strict", FALSE, NULL); g_signal_connect (session, "authenticate", G_CALLBACK (authenticate), NULL); @@ -194,7 +194,7 @@ do_proxy_fragment_test (gconstpointer data) SOUP_TEST_SKIP_IF_NO_APACHE; session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, proxy_resolvers[SIMPLE_PROXY], + "proxy-resolver", proxy_resolvers[SIMPLE_PROXY], NULL); req_uri = soup_uri_new_with_base (base_uri, "/#foo"); @@ -221,7 +221,7 @@ do_proxy_redirect_test (void) SOUP_TEST_SKIP_IF_NO_TLS; session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, proxy_resolvers[SIMPLE_PROXY], + "proxy-resolver", proxy_resolvers[SIMPLE_PROXY], NULL); req_uri = soup_uri_new (HTTPS_SERVER); @@ -296,8 +296,8 @@ do_proxy_auth_cache_test (void) g_free (cache_dir); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, proxy_resolvers[AUTH_PROXY], - SOUP_SESSION_ADD_FEATURE, cache, + "proxy-resolver", proxy_resolvers[AUTH_PROXY], + "add-feature", cache, NULL); g_signal_connect (session, "authenticate", G_CALLBACK (authenticate), NULL); diff --git a/tests/server-auth-test.c b/tests/server-auth-test.c index 54910967..f6da2b05 100644 --- a/tests/server-auth-test.c +++ b/tests/server-auth-test.c @@ -212,7 +212,7 @@ do_server_auth_test (gconstpointer data) (TEST_USES_BASIC (i) || TEST_USES_DIGEST (i)) && TEST_GOOD_AUTH (i)); /* 8. No auth required again. (Makes sure that - * SOUP_AUTH_DOMAIN_REMOVE_PATH works.) + * SoupAuthDomain:remove-path works.) */ do_test (base_uri, "/Any/Not/foo", TEST_GOOD_USER (i), TEST_GOOD_PASSWORD (i), @@ -345,21 +345,21 @@ main (int argc, char **argv) server_callback, NULL, NULL); auth_domain = soup_auth_domain_basic_new ( - SOUP_AUTH_DOMAIN_REALM, "server-auth-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/Basic", - SOUP_AUTH_DOMAIN_ADD_PATH, "/Any", - SOUP_AUTH_DOMAIN_REMOVE_PATH, "/Any/Not", - SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, basic_auth_callback, + "realm", "server-auth-test", + "add-path", "/Basic", + "add-path", "/Any", + "remove-path", "/Any/Not", + "auth-callback", basic_auth_callback, NULL); soup_server_add_auth_domain (server, auth_domain); g_object_unref (auth_domain); auth_domain = soup_auth_domain_digest_new ( - SOUP_AUTH_DOMAIN_REALM, "server-auth-test", - SOUP_AUTH_DOMAIN_ADD_PATH, "/Digest", - SOUP_AUTH_DOMAIN_ADD_PATH, "/Any", - SOUP_AUTH_DOMAIN_REMOVE_PATH, "/Any/Not", - SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK, digest_auth_callback, + "realm", "server-auth-test", + "add-path", "/Digest", + "add-path", "/Any", + "remove-path", "/Any/Not", + "auth-callback", digest_auth_callback, NULL); soup_server_add_auth_domain (server, auth_domain); g_object_unref (auth_domain); diff --git a/tests/server-test.c b/tests/server-test.c index 8b18f8a7..536a32a6 100644 --- a/tests/server-test.c +++ b/tests/server-test.c @@ -246,8 +246,8 @@ do_server_aliases_test (ServerData *sd, gconstpointer test_data) g_test_bug ("703694"); g_object_set (G_OBJECT (sd->server), - SOUP_SERVER_HTTP_ALIASES, http_aliases, - SOUP_SERVER_HTTPS_ALIASES, https_aliases, + "http-aliases", http_aliases, + "https-aliases", https_aliases, NULL); for (i = 0; http_good[i]; i++) @@ -1400,7 +1400,7 @@ do_steal_connect_test (ServerData *sd, gconstpointer test_data) resolver = g_simple_proxy_resolver_new (proxy_uri_str, NULL); session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, resolver, + "proxy-resolver", resolver, NULL); msg = soup_message_new_from_uri ("GET", sd->ssl_base_uri); soup_test_session_send_message (session, msg); diff --git a/tests/session-test.c b/tests/session-test.c index 16720a25..6e01267b 100644 --- a/tests/session-test.c +++ b/tests/session-test.c @@ -243,8 +243,8 @@ test_session_properties (const char *name, GTlsDatabase *tlsdb = NULL; g_object_get (G_OBJECT (session), - SOUP_SESSION_PROXY_RESOLVER, &proxy_resolver, - SOUP_SESSION_TLS_DATABASE, &tlsdb, + "proxy-resolver", &proxy_resolver, + "tls-database", &tlsdb, NULL); soup_test_assert (proxy_resolver == expected_proxy_resolver, @@ -279,7 +279,7 @@ do_property_tests (void) g_object_unref (session); session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, NULL, + "proxy-resolver", NULL, NULL); test_session_properties ("Session with NULL :proxy-resolver", session, NULL, default_tlsdb); @@ -287,7 +287,7 @@ do_property_tests (void) proxy_resolver = g_simple_proxy_resolver_new (NULL, NULL); session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_PROXY_RESOLVER, proxy_resolver, + "proxy-resolver", proxy_resolver, NULL); test_session_properties ("Session with non-NULL :proxy-resolver", session, proxy_resolver, default_tlsdb); @@ -295,7 +295,7 @@ do_property_tests (void) g_object_unref (session); session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_TLS_DATABASE, NULL, + "tls-database", NULL, NULL); test_session_properties ("Session with NULL :tls-database", session, default_proxy_resolver, NULL); @@ -313,7 +313,7 @@ do_property_tests (void) g_assert_no_error (error); session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_TLS_DATABASE, tlsdb, + "tls-database", tlsdb, NULL); test_session_properties ("Session with non-NULL :tls-database", session, default_proxy_resolver, tlsdb); @@ -322,14 +322,14 @@ do_property_tests (void) } session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, FALSE, + "ssl-use-system-ca-file", FALSE, NULL); test_session_properties ("Session with :ssl-use-system-ca-file FALSE", session, default_proxy_resolver, NULL); g_object_unref (session); session = g_object_new (SOUP_TYPE_SESSION, - SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, + "ssl-use-system-ca-file", TRUE, NULL); test_session_properties ("Session with :ssl-use-system-ca-file TRUE", session, default_proxy_resolver, default_tlsdb); diff --git a/tests/socket-test.c b/tests/socket-test.c index 0fd20529..03c062ec 100644 --- a/tests/socket-test.c +++ b/tests/socket-test.c @@ -35,7 +35,7 @@ do_unconnected_socket_test (void) localhost = g_inet_socket_address_new_from_string ("127.0.0.1", 0); - sock = soup_socket_new (SOUP_SOCKET_LOCAL_ADDRESS, localhost, + sock = soup_socket_new ("local-address", localhost, NULL); g_assert_true (sock != NULL); @@ -59,7 +59,7 @@ do_unconnected_socket_test (void) assert_host_equals (addr, "127.0.0.1"); g_assert_cmpuint (g_inet_socket_address_get_port (addr), >, 0); - client = soup_socket_new (SOUP_SOCKET_REMOTE_CONNECTABLE, soup_socket_get_local_address (sock), + client = soup_socket_new ("remote-connectable", soup_socket_get_local_address (sock), NULL); res = soup_socket_connect_sync (client, NULL); g_assert_cmpuint (res, ==, SOUP_STATUS_OK); @@ -71,7 +71,7 @@ do_unconnected_socket_test (void) g_assert_cmpuint (g_inet_socket_address_get_port (addr), >, 0); g_object_unref (client); - client = soup_socket_new (SOUP_SOCKET_REMOTE_CONNECTABLE, soup_socket_get_local_address (sock), + client = soup_socket_new ("remote-connectable", soup_socket_get_local_address (sock), NULL); /* save it for later */ @@ -152,15 +152,15 @@ do_socket_from_fd_client_test (void) g_assert_no_error (error); sock = g_initable_new (SOUP_TYPE_SOCKET, NULL, &error, - SOUP_SOCKET_GSOCKET, gsock, + "gsocket", gsock, NULL); g_assert_no_error (error); g_assert_nonnull (sock); g_object_get (G_OBJECT (sock), - SOUP_SOCKET_LOCAL_ADDRESS, &local, - SOUP_SOCKET_REMOTE_ADDRESS, &remote, - SOUP_SOCKET_IS_SERVER, &is_server, + "local-address", &local, + "remote-address", &remote, + "is-server", &is_server, NULL); g_assert_cmpint (socket_get_fd (sock), ==, g_socket_get_fd (gsock)); g_assert_false (is_server); @@ -210,14 +210,14 @@ do_socket_from_fd_server_test (void) g_assert_no_error (error); sock = g_initable_new (SOUP_TYPE_SOCKET, NULL, &error, - SOUP_SOCKET_GSOCKET, gsock, + "gsocket", gsock, NULL); g_assert_no_error (error); g_assert_nonnull (sock); g_object_get (G_OBJECT (sock), - SOUP_SOCKET_LOCAL_ADDRESS, &local, - SOUP_SOCKET_IS_SERVER, &is_server, + "local-address", &local, + "is-server", &is_server, NULL); g_assert_cmpint (socket_get_fd (sock), ==, g_socket_get_fd (gsock)); g_assert_true (is_server); @@ -255,7 +255,7 @@ do_socket_from_fd_bad_test (void) g_assert_false (g_socket_is_connected (gsock)); sock = g_initable_new (SOUP_TYPE_SOCKET, NULL, &error, - SOUP_SOCKET_GSOCKET, gsock, + "gsocket", gsock, NULL); g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED); g_clear_error (&error); @@ -297,15 +297,15 @@ do_socket_from_fd_bad_test (void) g_assert_nonnull (gsock2); sock2 = g_initable_new (SOUP_TYPE_SOCKET, NULL, &error, - SOUP_SOCKET_GSOCKET, gsock2, + "gsocket", gsock2, NULL); g_assert_no_error (error); g_assert_nonnull (sock2); g_object_get (G_OBJECT (sock2), - SOUP_SOCKET_LOCAL_ADDRESS, &local, - SOUP_SOCKET_REMOTE_ADDRESS, &remote, - SOUP_SOCKET_IS_SERVER, &is_server, + "local-address", &local, + "remote-address", &remote, + "is-server", &is_server, NULL); g_assert_cmpint (socket_get_fd (sock2), ==, g_socket_get_fd (gsock2)); g_assert_true (soup_socket_is_connected (sock2)); diff --git a/tests/ssl-test.c b/tests/ssl-test.c index c314b2d7..163e2fd9 100644 --- a/tests/ssl-test.c +++ b/tests/ssl-test.c @@ -36,12 +36,12 @@ do_strictness_test (gconstpointer data) NULL); if (!test->strict) { g_object_set (G_OBJECT (session), - SOUP_SESSION_SSL_STRICT, FALSE, + "ssl-strict", FALSE, NULL); } if (!test->with_ca_list) { g_object_set (G_OBJECT (session), - SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, + "ssl-use-system-ca-file", TRUE, NULL); } @@ -217,7 +217,7 @@ do_tls_interaction_test (void) interaction = g_object_new (test_tls_interaction_get_type (), NULL); g_object_set (G_OBJECT (session), - SOUP_SESSION_TLS_INTERACTION, interaction, + "tls-interaction", interaction, NULL); g_object_unref (interaction); diff --git a/tests/test-utils.c b/tests/test-utils.c index 9e07be0b..be561861 100644 --- a/tests/test-utils.c +++ b/tests/test-utils.c @@ -277,7 +277,7 @@ soup_test_session_new (GType type, ...) } g_object_set (G_OBJECT (session), - SOUP_SESSION_TLS_DATABASE, tlsdb, + "tls-database", tlsdb, NULL); g_clear_object (&tlsdb); } @@ -439,7 +439,7 @@ soup_test_server_new (SoupTestServerOptions options) } } - server = soup_server_new (SOUP_SERVER_TLS_CERTIFICATE, cert, + server = soup_server_new ("tls-certificate", cert, NULL); g_clear_object (&cert); diff --git a/tests/timeout-test.c b/tests/timeout-test.c index 0d773a4f..8b2bebd4 100644 --- a/tests/timeout-test.c +++ b/tests/timeout-test.c @@ -122,17 +122,17 @@ do_async_timeout_tests (gconstpointer data) extra_slow = FALSE; timeout_session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_TIMEOUT, extra_slow ? 3 : 1, + "timeout", extra_slow ? 3 : 1, NULL); idle_session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_IDLE_TIMEOUT, extra_slow ? 2 : 1, + "idle-timeout", extra_slow ? 2 : 1, NULL); /* The "plain" session also has an idle timeout, but it's longer * than the test takes, so for our purposes it should behave like * it has no timeout. */ plain_session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_IDLE_TIMEOUT, 20, + "idle-timeout", 20, NULL); do_msg_tests_for_session (timeout_session, idle_session, plain_session, @@ -163,9 +163,9 @@ do_sync_timeout_tests (gconstpointer data) extra_slow = FALSE; timeout_session = soup_test_session_new (SOUP_TYPE_SESSION, - SOUP_SESSION_TIMEOUT, extra_slow ? 3 : 1, + "timeout", extra_slow ? 3 : 1, NULL); - /* SOUP_SESSION_TIMEOUT doesn't work with sync sessions */ + /* SoupSession:timeout doesn't work with sync sessions */ plain_session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); do_msg_tests_for_session (timeout_session, NULL, plain_session, fast_uri, slow_uri); |