From c659f0adb5d20b4a01b3b51b80bbabce19814bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Oct 2022 11:10:50 +0200 Subject: [PATCH 1/6] lfb-event: Fix typo It's LfbEvent --- libfeedback/lfb-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libfeedback/lfb-event.c b/libfeedback/lfb-event.c index 6dcbf21..5d98c21 100644 --- a/libfeedback/lfb-event.c +++ b/libfeedback/lfb-event.c @@ -30,7 +30,7 @@ * * |[ * g_autoptr (GError) err = NULL; - * LpfEvent *event = lfb_event_new ("message-new-instant"); + * LfbEvent *event = lfb_event_new ("message-new-instant"); * lfb_event_set_timeout (event, 0); * if (!lfb_event_trigger_feedback (event, &err)) * g_warning ("Failed to trigger feedback: %s", err->message); From 8df5d1606e86b67d9f4e04430d0fde02f34998e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Oct 2022 11:12:37 +0200 Subject: [PATCH 2/6] lfb-event: Use consistent prefix Make async data use the same prefix. --- libfeedback/lfb-event.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libfeedback/lfb-event.c b/libfeedback/lfb-event.c index 5d98c21..37bd7c7 100644 --- a/libfeedback/lfb-event.c +++ b/libfeedback/lfb-event.c @@ -104,10 +104,10 @@ typedef struct _LfbEvent { G_DEFINE_TYPE (LfbEvent, lfb_event, G_TYPE_OBJECT); -typedef struct _LpfAsyncData { +typedef struct _LfbAsyncData { LfbEvent *event; GTask *task; -} LpfAsyncData; +} LfbAsyncData; static void lfb_event_set_state (LfbEvent *self, LfbEventState state) @@ -143,7 +143,7 @@ build_hints (LfbEvent *self) static void on_trigger_feedback_finished (LfbGdbusFeedback *proxy, GAsyncResult *res, - LpfAsyncData *data) + LfbAsyncData *data) { GTask *task = data->task; @@ -176,7 +176,7 @@ on_trigger_feedback_finished (LfbGdbusFeedback *proxy, static void on_end_feedback_finished (LfbGdbusFeedback *proxy, GAsyncResult *res, - LpfAsyncData *data) + LfbAsyncData *data) { GTask *task = data->task; @@ -462,7 +462,7 @@ lfb_event_trigger_feedback_async (LfbEvent *self, GAsyncReadyCallback callback, gpointer user_data) { - LpfAsyncData *data; + LfbAsyncData *data; LfbGdbusFeedback *proxy; g_return_if_fail (LFB_IS_EVENT (self)); @@ -482,7 +482,7 @@ lfb_event_trigger_feedback_async (LfbEvent *self, G_CONNECT_SWAPPED); } - data = g_new0 (LpfAsyncData, 1); + data = g_new0 (LfbAsyncData, 1); data->task = g_task_new (self, cancellable, callback, user_data); data->event = g_object_ref (self); lfb_gdbus_feedback_call_trigger_feedback (proxy, @@ -589,7 +589,7 @@ lfb_event_end_feedback_async (LfbEvent *self, GAsyncReadyCallback callback, gpointer user_data) { - LpfAsyncData *data; + LfbAsyncData *data; LfbGdbusFeedback *proxy; g_return_if_fail (LFB_IS_EVENT (self)); @@ -601,7 +601,7 @@ lfb_event_end_feedback_async (LfbEvent *self, proxy = _lfb_get_proxy (); g_return_if_fail (LFB_GDBUS_IS_FEEDBACK (proxy)); - data = g_new0 (LpfAsyncData, 1); + data = g_new0 (LfbAsyncData, 1); data->task = g_task_new (self, cancellable, callback, user_data); data->event = g_object_ref (self); lfb_gdbus_feedback_call_end_feedback (proxy, From dafb18678b932936848e7abc885779edaf87eab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Oct 2022 11:14:42 +0200 Subject: [PATCH 3/6] Use g_error() when library is not initalized This makes sure it still works when asserts are disabled. --- libfeedback/lfb-event.c | 24 ++++++++---------------- libfeedback/libfeedback.c | 12 ++++-------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/libfeedback/lfb-event.c b/libfeedback/lfb-event.c index 37bd7c7..4ba3d1f 100644 --- a/libfeedback/lfb-event.c +++ b/libfeedback/lfb-event.c @@ -415,10 +415,8 @@ lfb_event_trigger_feedback (LfbEvent *self, GError **error) g_return_val_if_fail (LFB_IS_EVENT (self), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (!lfb_is_initted ()) { - g_warning ("you must call lfb_init() before triggering events"); - g_assert_not_reached (); - } + if (!lfb_is_initted ()) + g_error ("You must call lfb_init() before triggering events."); proxy = _lfb_get_proxy (); g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), FALSE); @@ -466,10 +464,8 @@ lfb_event_trigger_feedback_async (LfbEvent *self, LfbGdbusFeedback *proxy; g_return_if_fail (LFB_IS_EVENT (self)); - if (!lfb_is_initted ()) { - g_warning ("you must call lfb_init() before triggering events"); - g_assert_not_reached (); - } + if (!lfb_is_initted ()) + g_error ("You must call lfb_init() before triggering events."); proxy = _lfb_get_proxy (); g_return_if_fail (LFB_GDBUS_IS_FEEDBACK (proxy)); @@ -537,10 +533,8 @@ lfb_event_end_feedback (LfbEvent *self, GError **error) g_return_val_if_fail (LFB_IS_EVENT (self), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (!lfb_is_initted ()) { - g_warning ("you must call lfb_init() before ending events"); - g_assert_not_reached (); - } + if (!lfb_is_initted ()) + g_error ("You must call lfb_init() before ending events."); proxy = _lfb_get_proxy (); g_return_val_if_fail (LFB_GDBUS_IS_FEEDBACK (proxy), FALSE); @@ -593,10 +587,8 @@ lfb_event_end_feedback_async (LfbEvent *self, LfbGdbusFeedback *proxy; g_return_if_fail (LFB_IS_EVENT (self)); - if (!lfb_is_initted ()) { - g_warning ("you must call lfb_init() before ending events"); - g_assert_not_reached (); - } + if (!lfb_is_initted ()) + g_error ("You must call lfb_init() before ending events."); proxy = _lfb_get_proxy (); g_return_if_fail (LFB_GDBUS_IS_FEEDBACK (proxy)); diff --git a/libfeedback/libfeedback.c b/libfeedback/libfeedback.c index 3855c72..76d8c6b 100644 --- a/libfeedback/libfeedback.c +++ b/libfeedback/libfeedback.c @@ -192,10 +192,8 @@ lfb_get_feedback_profile (void) { LfbGdbusFeedback *proxy; - if (!lfb_is_initted ()) { - g_warning ("you must call lfb_init() before getting the profile"); - g_assert_not_reached (); - } + if (!lfb_is_initted ()) + g_error ("You must call lfb_init() before ending events."); proxy = _lfb_get_proxy (); g_return_val_if_fail (LFB_GDBUS_IS_FEEDBACK (proxy), NULL); @@ -218,10 +216,8 @@ lfb_set_feedback_profile (const gchar *profile) { LfbGdbusFeedback *proxy; - if (!lfb_is_initted ()) { - g_warning ("you must call lfb_init() before setting the profile"); - g_assert_not_reached (); - } + if (!lfb_is_initted ()) + g_error ("You must call lfb_init() before ending events."); proxy = _lfb_get_proxy (); g_return_if_fail (LFB_GDBUS_IS_FEEDBACK (proxy)); From 14f99d6e673609834c010bba9dc581c58b4130dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Oct 2022 11:16:15 +0200 Subject: [PATCH 4/6] lfb-event: Untabify --- libfeedback/lfb-event.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libfeedback/lfb-event.c b/libfeedback/lfb-event.c index 4ba3d1f..fc193db 100644 --- a/libfeedback/lfb-event.c +++ b/libfeedback/lfb-event.c @@ -189,8 +189,8 @@ on_end_feedback_finished (LfbGdbusFeedback *proxy, g_return_if_fail (LFB_IS_EVENT (self)); success = lfb_gdbus_feedback_call_end_feedback_finish (proxy, - res, - &err); + res, + &err); if (!success) { g_task_return_error (task, g_steal_pointer (&err)); } else @@ -472,10 +472,10 @@ lfb_event_trigger_feedback_async (LfbEvent *self, if (self->handler_id == 0) { self->handler_id = g_signal_connect_object (proxy, - "feedback-ended", - G_CALLBACK (on_feedback_ended), - self, - G_CONNECT_SWAPPED); + "feedback-ended", + G_CALLBACK (on_feedback_ended), + self, + G_CONNECT_SWAPPED); } data = g_new0 (LfbAsyncData, 1); @@ -559,8 +559,8 @@ lfb_event_end_feedback (LfbEvent *self, GError **error) */ gboolean lfb_event_end_feedback_finish (LfbEvent *self, - GAsyncResult *res, - GError **error) + GAsyncResult *res, + GError **error) { g_return_val_if_fail (g_task_is_valid (res, self), FALSE); @@ -579,9 +579,9 @@ lfb_event_end_feedback_finish (LfbEvent *self, */ void lfb_event_end_feedback_async (LfbEvent *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { LfbAsyncData *data; LfbGdbusFeedback *proxy; From e782032efdd4e6294e1bc1309d039209020b581c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Oct 2022 11:35:16 +0200 Subject: [PATCH 5/6] tests: Drop unused variable --- tests/test-lfb-event.c | 1 - tests/test-lfb-integration.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/tests/test-lfb-event.c b/tests/test-lfb-event.c index 2236500..49d5b33 100644 --- a/tests/test-lfb-event.c +++ b/tests/test-lfb-event.c @@ -47,7 +47,6 @@ static void test_lfb_event_trigger (void) { g_autoptr(LfbEvent) event = NULL; - g_autofree gchar *evname = NULL; g_autoptr (GError) err = NULL; g_assert_true (lfb_init (TEST_APP_ID, NULL)); diff --git a/tests/test-lfb-integration.c b/tests/test-lfb-integration.c index 3e06203..d2ddd3f 100644 --- a/tests/test-lfb-integration.c +++ b/tests/test-lfb-integration.c @@ -68,9 +68,7 @@ static void test_lfb_integration_event_sync (void) { g_autoptr(LfbEvent) event0 = NULL; - g_autoptr(LfbEvent) event1 = NULL; g_autoptr(LfbEvent) event10 = NULL; - g_autofree gchar *evname = NULL; g_autoptr (GError) err = NULL; LfbEvent *cmp = NULL; gboolean success; @@ -103,7 +101,6 @@ static void test_lfb_integration_event_not_found (void) { g_autoptr(LfbEvent) event0 = NULL; - g_autofree gchar *evname = NULL; g_autoptr (GError) err = NULL; LfbEvent *cmp = NULL; gboolean success; @@ -174,8 +171,6 @@ test_lfb_integration_event_async (void) { g_autoptr(LfbEvent) event0 = NULL; g_autoptr(LfbEvent) event10 = NULL; - g_autofree gchar *evname = NULL; - g_autoptr (GError) err = NULL; LfbEvent *cmp1 = NULL, *cmp2 = NULL, *cmp3 = NULL; event0 = lfb_event_new ("test-dummy-0"); From 437d8290bf671c63b2c1224d6813b034b81e9cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 11 Oct 2022 11:39:41 +0200 Subject: [PATCH 6/6] tests/integration: Check the state of the ended event --- tests/test-lfb-integration.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test-lfb-integration.c b/tests/test-lfb-integration.c index d2ddd3f..639c7fa 100644 --- a/tests/test-lfb-integration.c +++ b/tests/test-lfb-integration.c @@ -60,6 +60,8 @@ on_feedback_ended (LfbEvent *event, LfbEvent **cmp) lfb_event_get_event (event), lfb_event_get_end_reason (event)); + g_assert_cmpint (lfb_event_get_state (event), ==, LFB_EVENT_STATE_ENDED); + /* "Return" event */ *cmp = event; } @@ -159,6 +161,7 @@ on_event_end_finished (LfbEvent *event, g_assert_no_error (err); g_assert_true (success); + /* This is not guaranteed for all types of feedback, see `feedback-ended` */ g_assert_cmpint (lfb_event_get_state (event), ==, LFB_EVENT_STATE_ENDED); /* "Return" event */