diff options
Diffstat (limited to 'libsoup')
| -rw-r--r-- | libsoup/auth/soup-auth-negotiate.c | 2 | ||||
| -rw-r--r-- | libsoup/server/soup-auth-domain.c | 36 | ||||
| -rw-r--r-- | libsoup/server/soup-server.c | 39 | ||||
| -rw-r--r-- | libsoup/soup-session.c | 67 |
4 files changed, 2 insertions, 142 deletions
diff --git a/libsoup/auth/soup-auth-negotiate.c b/libsoup/auth/soup-auth-negotiate.c index cf2befcf..46bd41bd 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 "add-feature-by-type"(), + * enable support for it, call soup_session_add_feature_by_type(), * passing %SOUP_TYPE_AUTH_NEGOTIATE. * * This auth type will only work if libsoup was compiled with GSSAPI diff --git a/libsoup/server/soup-auth-domain.c b/libsoup/server/soup-auth-domain.c index 1b7da219..3add8df5 100644 --- a/libsoup/server/soup-auth-domain.c +++ b/libsoup/server/soup-auth-domain.c @@ -50,8 +50,6 @@ enum { PROP_REALM, PROP_PROXY, - PROP_ADD_PATH, - PROP_REMOVE_PATH, PROP_FILTER, PROP_FILTER_DATA, PROP_GENERIC_AUTH_CALLBACK, @@ -116,14 +114,6 @@ soup_auth_domain_set_property (GObject *object, guint prop_id, case PROP_PROXY: priv->proxy = g_value_get_boolean (value); break; - case PROP_ADD_PATH: - soup_auth_domain_add_path (auth_domain, - g_value_get_string (value)); - break; - case PROP_REMOVE_PATH: - soup_auth_domain_remove_path (auth_domain, - g_value_get_string (value)); - break; case PROP_FILTER: priv->filter = g_value_get_pointer (value); break; @@ -207,32 +197,6 @@ soup_auth_domain_class_init (SoupAuthDomainClass *auth_domain_class) FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - /** - * SoupAuthDomain:add-path: - * - * Shortcut for calling soup_auth_domain_add_path(). - **/ - g_object_class_install_property ( - object_class, PROP_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)); - /** - * SoupAuthDomain:remove-path: - * - * Shortcut for calling soup_auth_domain_remove_path(). - **/ - g_object_class_install_property ( - object_class, PROP_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)); /** * SoupAuthDomain:filter: (type SoupAuthDomainFilter) diff --git a/libsoup/server/soup-server.c b/libsoup/server/soup-server.c index 33e4f6ee..40056c5e 100644 --- a/libsoup/server/soup-server.c +++ b/libsoup/server/soup-server.c @@ -191,8 +191,6 @@ enum { PROP_SERVER_HEADER, PROP_HTTP_ALIASES, PROP_HTTPS_ALIASES, - PROP_ADD_WEBSOCKET_EXTENSION, - PROP_REMOVE_WEBSOCKET_EXTENSION, LAST_PROP }; @@ -331,12 +329,6 @@ soup_server_set_property (GObject *object, guint prop_id, case PROP_HTTPS_ALIASES: set_aliases (&priv->https_aliases, g_value_get_boxed (value)); break; - case PROP_ADD_WEBSOCKET_EXTENSION: - soup_server_add_websocket_extension (server, g_value_get_gtype (value)); - break; - case PROP_REMOVE_WEBSOCKET_EXTENSION: - soup_server_remove_websocket_extension (server, g_value_get_gtype (value)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -592,37 +584,6 @@ soup_server_class_init (SoupServerClass *server_class) "URI schemes that are considered aliases for 'https'", G_TYPE_STRV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * SoupServer:add-websocket-extension: (skip) - * - * Add support for #SoupWebsocketExtension of the given type. - * (Shortcut for calling soup_server_add_websocket_extension().) - * - * Since: 2.68 - **/ - g_object_class_install_property ( - object_class, PROP_ADD_WEBSOCKET_EXTENSION, - g_param_spec_gtype ("add-websocket-extension", - "Add support for a WebSocket extension", - "Add support for a WebSocket extension of the given type", - SOUP_TYPE_WEBSOCKET_EXTENSION, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); - /** - * SoupServer:remove-websocket-extension: (skip) - * - * Remove support for #SoupWebsocketExtension of the given type. (Shortcut for - * calling soup_server_remove_websocket_extension().) - * - * Since: 2.68 - **/ - g_object_class_install_property ( - object_class, PROP_REMOVE_WEBSOCKET_EXTENSION, - g_param_spec_gtype ("remove-websocket-extension", - "Remove support for a WebSocket extension", - "Remove support for a WebSocket extension of the given type", - SOUP_TYPE_WEBSOCKET_EXTENSION, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); } /** diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index d2258ccd..8379cd48 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -186,9 +186,6 @@ enum { PROP_ACCEPT_LANGUAGE, PROP_ACCEPT_LANGUAGE_AUTO, PROP_IDLE_TIMEOUT, - PROP_ADD_FEATURE, - PROP_ADD_FEATURE_BY_TYPE, - PROP_REMOVE_FEATURE_BY_TYPE, PROP_HTTP_ALIASES, PROP_HTTPS_ALIASES, PROP_LOCAL_ADDRESS, @@ -506,15 +503,6 @@ soup_session_set_property (GObject *object, guint prop_id, priv->idle_timeout = g_value_get_uint (value); socket_props_changed = TRUE; break; - case PROP_ADD_FEATURE: - soup_session_add_feature (session, g_value_get_object (value)); - break; - case PROP_ADD_FEATURE_BY_TYPE: - soup_session_add_feature_by_type (session, g_value_get_gtype (value)); - break; - case PROP_REMOVE_FEATURE_BY_TYPE: - soup_session_remove_feature_by_type (session, g_value_get_gtype (value)); - break; case PROP_HTTP_ALIASES: set_aliases (&priv->http_aliases, g_value_get_boxed (value)); break; @@ -2033,9 +2021,7 @@ soup_session_abort (SoupSession *session) * @session: a #SoupSession * @feature: an object that implements #SoupSessionFeature * - * Adds @feature's functionality to @session. You can also add a - * feature to the session at construct time by using the - * SoupSession:add-feature property. + * Adds @feature's functionality to @session. * * See the main #SoupSession documentation for information on what * features are present in sessions by default. @@ -2070,9 +2056,6 @@ soup_session_add_feature (SoupSession *session, SoupSessionFeature *feature) * existing feature on @session the chance to accept @feature_type as * 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 SoupSession:add-feature-by-type property. - * * See the main #SoupSession documentation for information on what * features are present in sessions by default. * @@ -2610,54 +2593,6 @@ soup_session_class_init (SoupSessionClass *session_class) G_PARAM_STATIC_STRINGS)); /** - * SoupSession:add-feature: (skip) - * - * Add a feature object to the session. (Shortcut for calling - * soup_session_add_feature().) - * - * Since: 2.24 - **/ - g_object_class_install_property ( - object_class, PROP_ADD_FEATURE, - g_param_spec_object ("add-feature", - "Add Feature", - "Add a feature object to the session", - SOUP_TYPE_SESSION_FEATURE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS)); - /** - * SoupSession:add-feature-by-type: (skip) - * - * Add a feature object of the given type to the session. - * (Shortcut for calling soup_session_add_feature_by_type().) - * - * Since: 2.24 - **/ - g_object_class_install_property ( - object_class, PROP_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, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS)); - /** - * SoupSession:remove-feature-by-type: (skip) - * - * Remove feature objects from the session. (Shortcut for - * calling soup_session_remove_feature_by_type().) - * - * Since: 2.24 - **/ - g_object_class_install_property ( - object_class, PROP_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, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS)); - /** * SoupSession:http-aliases: * * A %NULL-terminated array of URI schemes that should be |