Remove session parameter from SoupSessionFeature::request-queued/unqueued

It's unused and features are already attached to a session with
SoupSessionFeature::attach.

10 files changed, 17 insertions, 35 deletions

diff --git a/libsoup/auth/soup-auth-manager.c b/libsoup/auth/soup-auth-manager.c
index c05fa844..fad393f1 100644
--- a/libsoup/auth/soup-auth-manager.c
+++ b/libsoup/auth/soup-auth-manager.c
@@ -749,8 +749,7 @@ auth_msg_starting (SoupMessage *msg, gpointer manager)
 
 static void
 soup_auth_manager_request_queued (SoupSessionFeature *manager,
-				  SoupSession *session,
-				  SoupMessage *msg)
+				  SoupMessage        *msg)
 {
 	g_signal_connect (msg, "starting",
 			  G_CALLBACK (auth_msg_starting), manager);
@@ -772,8 +771,7 @@ soup_auth_manager_request_queued (SoupSessionFeature *manager,
 
 static void
 soup_auth_manager_request_unqueued (SoupSessionFeature *manager,
-				    SoupSession *session,
-				    SoupMessage *msg)
+				    SoupMessage        *msg)
 {
 	g_signal_handlers_disconnect_matched (msg, G_SIGNAL_MATCH_DATA,
 					      0, 0, NULL, NULL, manager);
diff --git a/libsoup/cache/soup-cache.c b/libsoup/cache/soup-cache.c
index 1144b5b0..8aa117af 100644
--- a/libsoup/cache/soup-cache.c
+++ b/libsoup/cache/soup-cache.c
@@ -743,7 +743,8 @@ msg_starting_cb (SoupMessage *msg, gpointer user_data)
 }
 
 static void
-request_queued (SoupSessionFeature *feature, SoupSession *session, SoupMessage *msg)
+request_queued (SoupSessionFeature *feature,
+		SoupMessage        *msg)
 {
 	g_signal_connect (msg, "starting", G_CALLBACK (msg_starting_cb), feature);
 }
diff --git a/libsoup/content-sniffer/soup-content-decoder.c b/libsoup/content-sniffer/soup-content-decoder.c
index eeb880ff..d8d5b5be 100644
--- a/libsoup/content-sniffer/soup-content-decoder.c
+++ b/libsoup/content-sniffer/soup-content-decoder.c
@@ -246,8 +246,7 @@ soup_content_decoder_class_init (SoupContentDecoderClass *decoder_class)
 
 static void
 soup_content_decoder_request_queued (SoupSessionFeature *feature,
-				     SoupSession *session,
-				     SoupMessage *msg)
+				     SoupMessage        *msg)
 {
 	if (!soup_message_headers_get_one (msg->request_headers,
 					   "Accept-Encoding")) {
diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
index f5653417..bfb4f541 100644
--- a/libsoup/content-sniffer/soup-content-sniffer.c
+++ b/libsoup/content-sniffer/soup-content-sniffer.c
@@ -853,8 +853,7 @@ soup_content_sniffer_got_headers_cb (SoupMessage *msg, SoupContentSniffer *sniff
 
 static void
 soup_content_sniffer_request_queued (SoupSessionFeature *feature,
-				     SoupSession *session,
-				     SoupMessage *msg)
+				     SoupMessage        *msg)
 {
 	soup_message_set_content_sniffer (msg, SOUP_CONTENT_SNIFFER (feature));
 	g_signal_connect (msg, "got-headers",
@@ -864,8 +863,7 @@ soup_content_sniffer_request_queued (SoupSessionFeature *feature,
 
 static void
 soup_content_sniffer_request_unqueued (SoupSessionFeature *feature,
-				       SoupSession *session,
-				       SoupMessage *msg)
+				       SoupMessage        *msg)
 {
 	soup_message_set_content_sniffer (msg, NULL);
 
diff --git a/libsoup/cookies/soup-cookie-jar.c b/libsoup/cookies/soup-cookie-jar.c
index 1cd736e9..f46d527b 100644
--- a/libsoup/cookies/soup-cookie-jar.c
+++ b/libsoup/cookies/soup-cookie-jar.c
@@ -825,8 +825,7 @@ msg_starting_cb (SoupMessage *msg, gpointer feature)
 
 static void
 soup_cookie_jar_request_queued (SoupSessionFeature *feature,
-				SoupSession *session,
-				SoupMessage *msg)
+				SoupMessage        *msg)
 {
 	g_signal_connect (msg, "starting",
 			  G_CALLBACK (msg_starting_cb),
@@ -844,8 +843,7 @@ soup_cookie_jar_request_queued (SoupSessionFeature *feature,
 
 static void
 soup_cookie_jar_request_unqueued (SoupSessionFeature *feature,
-				  SoupSession *session,
-				  SoupMessage *msg)
+				  SoupMessage        *msg)
 {
 	g_signal_handlers_disconnect_by_data (msg, feature);
 }
diff --git a/libsoup/hsts/soup-hsts-enforcer.c b/libsoup/hsts/soup-hsts-enforcer.c
index 63c96f3b..25b89a50 100644
--- a/libsoup/hsts/soup-hsts-enforcer.c
+++ b/libsoup/hsts/soup-hsts-enforcer.c
@@ -569,8 +569,7 @@ soup_hsts_enforcer_attach (SoupSessionFeature *feature, SoupSession *session)
 
 static void
 soup_hsts_enforcer_request_queued (SoupSessionFeature *feature,
-				   SoupSession *session,
-				   SoupMessage *msg)
+				   SoupMessage        *msg)
 {
 	g_signal_connect (msg, "restarted", G_CALLBACK (message_restarted_cb), feature);
 	preprocess_request (SOUP_HSTS_ENFORCER (feature), msg);
@@ -578,8 +577,7 @@ soup_hsts_enforcer_request_queued (SoupSessionFeature *feature,
 
 static void
 soup_hsts_enforcer_request_unqueued (SoupSessionFeature *feature,
-				     SoupSession *session,
-				     SoupMessage *msg)
+				     SoupMessage        *msg)
 {
 	g_signal_handlers_disconnect_by_data (msg, feature);
 }
diff --git a/libsoup/soup-logger.c b/libsoup/soup-logger.c
index 41bfcdc0..8d8652b1 100644
--- a/libsoup/soup-logger.c
+++ b/libsoup/soup-logger.c
@@ -720,8 +720,7 @@ starting (SoupMessage *msg, gpointer user_data)
 
 static void
 soup_logger_request_queued (SoupSessionFeature *logger,
-			    SoupSession *session,
-			    SoupMessage *msg)
+			    SoupMessage        *msg)
 {
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
 
@@ -741,8 +740,7 @@ soup_logger_request_queued (SoupSessionFeature *logger,
 
 static void
 soup_logger_request_unqueued (SoupSessionFeature *logger,
-			      SoupSession *session,
-			      SoupMessage *msg)
+			      SoupMessage        *msg)
 {
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
 
diff --git a/libsoup/soup-session-feature.c b/libsoup/soup-session-feature.c
index 26f10348..049dd75a 100644
--- a/libsoup/soup-session-feature.c
+++ b/libsoup/soup-session-feature.c
@@ -88,13 +88,11 @@ soup_session_feature_default_init (SoupSessionFeatureInterface *iface)
 
 void
 soup_session_feature_request_queued (SoupSessionFeature *feature,
-				     SoupSession        *session,
 				     SoupMessage        *msg)
 {
 	SoupSessionFeatureInterface *iface;
 
 	g_return_if_fail (SOUP_IS_SESSION_FEATURE (feature));
-	g_return_if_fail (SOUP_IS_SESSION (session));
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
 
 	if (soup_message_disables_feature (msg, feature))
@@ -102,18 +100,16 @@ soup_session_feature_request_queued (SoupSessionFeature *feature,
 
 	iface = SOUP_SESSION_FEATURE_GET_IFACE (feature);
 	if (iface->request_queued)
-		iface->request_queued (feature, session, msg);
+		iface->request_queued (feature, msg);
 }
 
 void
 soup_session_feature_request_unqueued (SoupSessionFeature *feature,
-				       SoupSession        *session,
 				       SoupMessage        *msg)
 {
 	SoupSessionFeatureInterface *iface;
 
 	g_return_if_fail (SOUP_IS_SESSION_FEATURE (feature));
-	g_return_if_fail (SOUP_IS_SESSION (session));
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
 
 	if (soup_message_disables_feature (msg, feature))
@@ -121,7 +117,7 @@ soup_session_feature_request_unqueued (SoupSessionFeature *feature,
 
 	iface = SOUP_SESSION_FEATURE_GET_IFACE (feature);
         if (iface->request_unqueued)
-                iface->request_unqueued (feature, session, msg);
+                iface->request_unqueued (feature, msg);
 }
 
 /**
diff --git a/libsoup/soup-session-feature.h b/libsoup/soup-session-feature.h
index ee46a8d7..134a79aa 100644
--- a/libsoup/soup-session-feature.h
+++ b/libsoup/soup-session-feature.h
@@ -23,10 +23,8 @@ struct _SoupSessionFeatureInterface {
 				      SoupSession        *session);
 
 	void     (*request_queued)   (SoupSessionFeature *feature,
-				      SoupSession        *session,
 				      SoupMessage        *msg);
 	void     (*request_unqueued) (SoupSessionFeature *feature,
-				      SoupSession        *session,
 				      SoupMessage        *msg);
 
 	gboolean (*add_feature)      (SoupSessionFeature *feature,
@@ -47,11 +45,9 @@ void     soup_session_feature_detach         (SoupSessionFeature *feature,
 
 SOUP_AVAILABLE_IN_ALL
 void     soup_session_feature_request_queued (SoupSessionFeature *feature,
-					      SoupSession        *session,
 					      SoupMessage        *msg);
 SOUP_AVAILABLE_IN_ALL
 void     soup_session_feature_request_unqueued (SoupSessionFeature *feature,
-						SoupSession        *session,
 						SoupMessage        *msg);
 
 SOUP_AVAILABLE_IN_2_34
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 557835bc..98aab880 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -1000,7 +1000,7 @@ soup_session_append_queue_item (SoupSession        *session,
 		SoupSessionFeature *feature = SOUP_SESSION_FEATURE (f->data);
 
 		g_object_ref (feature);
-		soup_session_feature_request_queued (feature, session, msg);
+		soup_session_feature_request_queued (feature, msg);
 	}
 	g_signal_emit (session, signals[REQUEST_QUEUED], 0, msg);
 
@@ -1229,7 +1229,7 @@ soup_session_unqueue_item (SoupSession          *session,
 	for (f = priv->features; f; f = g_slist_next (f)) {
 		SoupSessionFeature *feature = SOUP_SESSION_FEATURE (f->data);
 
-		soup_session_feature_request_unqueued (feature, session, item->msg);
+		soup_session_feature_request_unqueued (feature, item->msg);
 		g_object_unref (feature);
 	}
 	g_signal_emit (session, signals[REQUEST_UNQUEUED], 0, item->msg);