SymbX/feedbackd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cleanups' into 'main'

Browse Source 
Some cleanups I noticed while looking at the code

See merge request Librem5/feedbackd!79
This commit is contained in:
Guido Gunther
2022-10-12 08:25:29 +00:00
parent 7391062b87 437d8290bf
commit 1dc58eb99f
4 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfeedback/lfb-event.c
+28 -36
View File
@@ -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);
@@ -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;
@@ -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
@@ -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);
@@ -462,27 +460,25 @@ 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));
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));
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 (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,
@@ -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);
@@ -565,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);
@@ -585,23 +579,21 @@ 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)
{
LpfAsyncData *data;
LfbAsyncData *data;
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));
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,
libfeedback/libfeedback.c
+4 -8
View File
@@ -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));
tests/test-lfb-event.c
-1
View File
@@ -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));
tests/test-lfb-integration.c
+3 -5
View File
@@ -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;
}
@@ -68,9 +70,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 +103,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;
@@ -162,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 */
@@ -174,8 +174,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");