fw_req: remove deprecated signal

Hinawa.FwReq::responded has been deprecated since version 2.6.

This commit removes it.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

4 files changed, 5 insertions, 74 deletions

diff --git a/src/fw_req.c b/src/fw_req.c
index eeda9e7..1fa7130 100644
--- a/src/fw_req.c
+++ b/src/fw_req.c
@@ -96,8 +96,7 @@ static void fw_req_set_property(GObject *obj, guint id, const GValue *val,
 }
 
 enum fw_req_sig_type {
-	FW_REQ_SIG_TYPE_RESPONDED = 1,
-	FW_REQ_SIG_TYPE_RESPONDED2,
+	FW_REQ_SIG_TYPE_RESPONDED2 = 1,
 	FW_REQ_SIG_TYPE_COUNT,
 };
 static guint fw_req_sigs[FW_REQ_SIG_TYPE_COUNT] = { 0 };
@@ -127,32 +126,6 @@ static void hinawa_fw_req_class_init(HinawaFwReqClass *klass)
 					  fw_req_props);
 
 	/**
-	 * HinawaFwReq::responded:
-	 * @self: A [class@FwReq].
-	 * @rcode: One of [enum@FwRcode].
-	 * @frame: (array length=frame_size)(element-type guint8): The array with elements for
-	 *	   byte data of response subaction for transaction.
-	 * @frame_size: The number of elements of the array.
-	 *
-	 * Emitted when the unit transfers asynchronous packet as response subaction for the
-	 * transaction and the process successfully reads the content of packet from Linux firewire
-	 * subsystem, except for the case that [signal@FwReq::responded2] signal handler is already
-	 * assigned.
-	 *
-	 * Since: 2.1
-	 * Deprecated: 2.6: Use [signal@FwReq::responded2], instead.
-	 */
-	fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED] =
-		g_signal_new("responded",
-			     G_OBJECT_CLASS_TYPE(klass),
-			     G_SIGNAL_RUN_LAST,
-			     G_STRUCT_OFFSET(HinawaFwReqClass, responded),
-			     NULL, NULL,
-			     hinawa_sigs_marshal_VOID__ENUM_POINTER_UINT,
-			     G_TYPE_NONE,
-			     3, HINAWA_TYPE_FW_RCODE, G_TYPE_POINTER, G_TYPE_UINT);
-
-	/**
 	 * HinawaFwReq::responded2:
 	 * @self: A [class@FwReq].
 	 * @rcode: One of [enum@FwRcode].
@@ -503,40 +476,17 @@ gboolean hinawa_fw_req_transaction(HinawaFwReq *self, HinawaFwNode *node,
 // NOTE: For HinawaFwNode, internal.
 void hinawa_fw_req_handle_response(HinawaFwReq *self, const struct fw_cdev_event_response *event)
 {
-	HinawaFwReqClass *klass;
-
 	g_return_if_fail(HINAWA_IS_FW_REQ(self));
 
-	klass = HINAWA_FW_REQ_GET_CLASS(self);
-
-	if (klass->responded2 != NULL ||
-	    g_signal_has_handler_pending(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED2], 0, TRUE)) {
-		g_signal_emit(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED2], 0, event->rcode,
-			      G_MAXUINT, G_MAXUINT, event->data, event->length);
-	} else if (klass->responded != NULL ||
-		   g_signal_has_handler_pending(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED], 0, TRUE)) {
-		g_signal_emit(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED], 0, event->rcode,
-			      event->data, event->length);
-	}
+	g_signal_emit(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED2], 0, event->rcode, G_MAXUINT,
+		      G_MAXUINT, event->data, event->length);
 }
 
 // NOTE: For HinawaFwNode, internal.
 void hinawa_fw_req_handle_response2(HinawaFwReq *self, const struct fw_cdev_event_response2 *event)
 {
-	HinawaFwReqClass *klass;
-
 	g_return_if_fail(HINAWA_IS_FW_REQ(self));
 
-	klass = HINAWA_FW_REQ_GET_CLASS(self);
-
-	if (klass->responded2 != NULL ||
-	    g_signal_has_handler_pending(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED2], 0, TRUE)) {
-		g_signal_emit(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED2], 0, event->rcode,
-			      event->request_tstamp, event->response_tstamp, event->data,
-			      event->length);
-	} else if (klass->responded != NULL ||
-		   g_signal_has_handler_pending(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED], 0, TRUE)) {
-		g_signal_emit(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED], 0, event->rcode,
-			      event->data, event->length);
-	}
+	g_signal_emit(self, fw_req_sigs[FW_REQ_SIG_TYPE_RESPONDED2], 0, event->rcode,
+		      event->request_tstamp, event->response_tstamp, event->data, event->length);
 }
diff --git a/src/fw_req.h b/src/fw_req.h
index 8836ace..cb834ed 100644
--- a/src/fw_req.h
+++ b/src/fw_req.h
@@ -18,22 +18,6 @@ struct _HinawaFwReqClass {
 	GObjectClass parent_class;
 
 	/**
-	 * HinawaFwReqClass::responded:
-	 * @self: A [class@FwReq].
-	 * @rcode: One of [enum@FwRcode].
-	 * @frame: (array length=frame_size)(element-type guint8): The array with elements for
-	 *	   byte data of response subaction for transaction.
-	 * @frame_size: The number of elements of the array.
-	 *
-	 * Class closure for the [signal@FwReq::responded] signal.
-	 *
-	 * Since: 2.1
-	 * Deprecated: 2.6: Use [vfunc@FwReq.responded2], instead.
-	 */
-	void (*responded)(HinawaFwReq *self, HinawaFwRcode rcode,
-			  const guint8 *frame, guint frame_size);
-
-	/**
 	 * HinawaFwReqClass::responded2:
 	 * @self: A [class@FwReq].
 	 * @rcode: One of [enum@FwRcode].
diff --git a/src/hinawa_sigs_marshal.list b/src/hinawa_sigs_marshal.list
index 29d1265..3e793b6 100644
--- a/src/hinawa_sigs_marshal.list
+++ b/src/hinawa_sigs_marshal.list
@@ -1,5 +1,4 @@
 ENUM:ENUM
-VOID:ENUM,POINTER,UINT
 VOID:ENUM,UINT,UINT,POINTER,UINT
 VOID:POINTER,UINT
 VOID:UINT,POINTER,UINT
diff --git a/tests/fw-req b/tests/fw-req
index e061a8f..ae41ea5 100755
--- a/tests/fw-req
+++ b/tests/fw-req
@@ -20,11 +20,9 @@ methods = (
     'transaction_with_tstamp',
 )
 vmethods = (
-    'do_responded',
     'do_responded2',
 )
 signals = (
-    'responded',
     'responded2',
 )