From 523ec151d13df47757f30426a3eed67aba306505 Mon Sep 17 00:00:00 2001 From: Bardia Moshiri Date: Tue, 11 Feb 2025 22:13:45 -0500 Subject: [PATCH] ofono: fixup styling Signed-off-by: Bardia Moshiri Part-of: --- plugins/provider/ofono/calls-ofono-call.c | 14 ++--- plugins/provider/ofono/calls-ofono-origin.c | 58 +++++++++---------- plugins/provider/ofono/calls-ofono-provider.c | 24 ++++---- 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/plugins/provider/ofono/calls-ofono-call.c b/plugins/provider/ofono/calls-ofono-call.c index 8b6b2da..d7a5fe7 100644 --- a/plugins/provider/ofono/calls-ofono-call.c +++ b/plugins/provider/ofono/calls-ofono-call.c @@ -103,10 +103,9 @@ calls_ofono_call_answer (CallsCall *call) data->self = g_object_ref (self); data->finish_func = gdbo_voice_call_call_answer_finish; - gdbo_voice_call_call_answer - (self->voice_call, NULL, - (GAsyncReadyCallback) operation_cb, - data); + gdbo_voice_call_call_answer (self->voice_call, NULL, + (GAsyncReadyCallback) operation_cb, + data); } @@ -121,10 +120,9 @@ calls_ofono_call_hang_up (CallsCall *call) data->self = g_object_ref (self); data->finish_func = gdbo_voice_call_call_hangup_finish; - gdbo_voice_call_call_hangup - (self->voice_call, NULL, - (GAsyncReadyCallback) operation_cb, - data); + gdbo_voice_call_call_hangup (self->voice_call, NULL, + (GAsyncReadyCallback) operation_cb, + data); } diff --git a/plugins/provider/ofono/calls-ofono-origin.c b/plugins/provider/ofono/calls-ofono-origin.c index 915c883..504155c 100644 --- a/plugins/provider/ofono/calls-ofono-origin.c +++ b/plugins/provider/ofono/calls-ofono-origin.c @@ -315,8 +315,7 @@ dial_cb (GDBOVoiceCallManager *voice, g_autoptr (GError) error = NULL; - ok = gdbo_voice_call_manager_call_dial_finish - (voice, NULL, res, &error); + ok = gdbo_voice_call_manager_call_dial_finish (voice, NULL, res, &error); if (!ok) { g_warning ("Error dialing number on modem `%s': %s", self->name, error->message); @@ -335,13 +334,12 @@ dial (CallsOrigin *origin, const gchar *number) g_return_if_fail (self->voice != NULL); - gdbo_voice_call_manager_call_dial - (self->voice, - number, - "default" /* default caller id settings */, - NULL, - (GAsyncReadyCallback) dial_cb, - self); + gdbo_voice_call_manager_call_dial (self->voice, + number, + "default" /* default caller id settings */, + NULL, + (GAsyncReadyCallback) dial_cb, + self); } @@ -390,8 +388,7 @@ set_property (GObject *object, break; case PROP_MODEM: - g_set_object - (&self->modem, GDBO_MODEM (g_value_get_object (value))); + g_set_object (&self->modem, GDBO_MODEM (g_value_get_object (value))); break; default: @@ -598,14 +595,13 @@ call_added_cb (GDBOVoiceCallManager *voice, data->properties = properties; g_variant_ref (properties); - gdbo_voice_call_proxy_new - (self->connection, - G_DBUS_PROXY_FLAGS_NONE, - g_dbus_proxy_get_name (G_DBUS_PROXY (voice)), - path, - NULL, - (GAsyncReadyCallback) voice_call_proxy_new_cb, - data); + gdbo_voice_call_proxy_new (self->connection, + G_DBUS_PROXY_FLAGS_NONE, + g_dbus_proxy_get_name (G_DBUS_PROXY (voice)), + path, + NULL, + (GAsyncReadyCallback) voice_call_proxy_new_cb, + data); g_debug ("Call `%s' addition in progress", path); } @@ -660,8 +656,10 @@ get_calls_cb (GDBOVoiceCallManager *voice, const gchar *path; GVariant *properties; - ok = gdbo_voice_call_manager_call_get_calls_finish - (voice, &calls_with_properties, res, &error); + ok = gdbo_voice_call_manager_call_get_calls_finish (voice, + &calls_with_properties, + res, + &error); if (!ok) { g_warning ("Error getting calls from oFono" " VoiceCallManager `%s': %s", @@ -697,8 +695,7 @@ voice_new_cb (GDBusConnection *connection, { g_autoptr (GError) error = NULL; - self->voice = gdbo_voice_call_manager_proxy_new_finish - (res, &error); + self->voice = gdbo_voice_call_manager_proxy_new_finish (res, &error); if (!self->voice) { g_warning ("Error creating oFono" " VoiceCallManager `%s' proxy: %s", @@ -756,14 +753,13 @@ constructed (GObject *object) if (name) self->name = g_strdup (name); - gdbo_voice_call_manager_proxy_new - (self->connection, - G_DBUS_PROXY_FLAGS_NONE, - g_dbus_proxy_get_name (modem_proxy), - g_dbus_proxy_get_object_path (modem_proxy), - NULL, - (GAsyncReadyCallback) voice_new_cb, - self); + gdbo_voice_call_manager_proxy_new (self->connection, + G_DBUS_PROXY_FLAGS_NONE, + g_dbus_proxy_get_name (modem_proxy), + g_dbus_proxy_get_object_path (modem_proxy), + NULL, + (GAsyncReadyCallback) voice_new_cb, + self); G_OBJECT_CLASS (calls_ofono_origin_parent_class)->constructed (object); diff --git a/plugins/provider/ofono/calls-ofono-provider.c b/plugins/provider/ofono/calls-ofono-provider.c index 3c7768e..7e6a7dd 100644 --- a/plugins/provider/ofono/calls-ofono-provider.c +++ b/plugins/provider/ofono/calls-ofono-provider.c @@ -321,14 +321,13 @@ modem_added_cb (GDBOManager *manager, g_variant_ref (data->ifaces); } - gdbo_modem_proxy_new - (self->connection, - G_DBUS_PROXY_FLAGS_NONE, - g_dbus_proxy_get_name (G_DBUS_PROXY (manager)), - path, - NULL, - (GAsyncReadyCallback) modem_proxy_new_cb, - data); + gdbo_modem_proxy_new (self->connection, + G_DBUS_PROXY_FLAGS_NONE, + g_dbus_proxy_get_name (G_DBUS_PROXY (manager)), + path, + NULL, + (GAsyncReadyCallback) modem_proxy_new_cb, + data); g_debug ("Modem `%s' addition in progress", path); } @@ -447,11 +446,10 @@ ofono_appeared_cb (GDBusConnection *connection, g_signal_connect (self->manager, "modem-removed", G_CALLBACK (modem_removed_cb), self); - gdbo_manager_call_get_modems - (self->manager, - NULL, - (GAsyncReadyCallback) get_modems_cb, - self); + gdbo_manager_call_get_modems (self->manager, + NULL, + (GAsyncReadyCallback) get_modems_cb, + self); }