kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofono: fixup styling

Browse Source 
Signed-off-by: Bardia Moshiri <bardia@furilabs.com>
Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/742>
This commit is contained in:
Bardia Moshiri
2025-02-11 22:13:45 -05:00
committed by Marge Bot
parent 524235b86c
commit 523ec151d1
3 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/provider/ofono/calls-ofono-call.c
View File

@@ -103,10 +103,9 @@ calls_ofono_call_answer (CallsCall *call)
data->self = g_object_ref (self); data->self = g_object_ref (self);
data->finish_func = gdbo_voice_call_call_answer_finish; data->finish_func = gdbo_voice_call_call_answer_finish;
gdbo_voice_call_call_answer gdbo_voice_call_call_answer (self->voice_call, NULL,
(self->voice_call, NULL, (GAsyncReadyCallback) operation_cb,
(GAsyncReadyCallback) operation_cb, data);
data);
} }
@@ -121,10 +120,9 @@ calls_ofono_call_hang_up (CallsCall *call)
data->self = g_object_ref (self); data->self = g_object_ref (self);
data->finish_func = gdbo_voice_call_call_hangup_finish; data->finish_func = gdbo_voice_call_call_hangup_finish;
gdbo_voice_call_call_hangup gdbo_voice_call_call_hangup (self->voice_call, NULL,
(self->voice_call, NULL, (GAsyncReadyCallback) operation_cb,
(GAsyncReadyCallback) operation_cb, data);
data);
} }

58
plugins/provider/ofono/calls-ofono-origin.c
View File

@@ -315,8 +315,7 @@ dial_cb (GDBOVoiceCallManager *voice,
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
ok = gdbo_voice_call_manager_call_dial_finish ok = gdbo_voice_call_manager_call_dial_finish (voice, NULL, res, &error);
(voice, NULL, res, &error);
if (!ok) { if (!ok) {
g_warning ("Error dialing number on modem `%s': %s", g_warning ("Error dialing number on modem `%s': %s",
self->name, error->message); self->name, error->message);
@@ -335,13 +334,12 @@ dial (CallsOrigin *origin, const gchar *number)
g_return_if_fail (self->voice != NULL); g_return_if_fail (self->voice != NULL);
gdbo_voice_call_manager_call_dial gdbo_voice_call_manager_call_dial (self->voice,
(self->voice, number,
number, "default" /* default caller id settings */,
"default" /* default caller id settings */, NULL,
NULL, (GAsyncReadyCallback) dial_cb,
(GAsyncReadyCallback) dial_cb, self);
self);
} }
@@ -390,8 +388,7 @@ set_property (GObject *object,
break; break;
case PROP_MODEM: case PROP_MODEM:
g_set_object g_set_object (&self->modem, GDBO_MODEM (g_value_get_object (value)));
(&self->modem, GDBO_MODEM (g_value_get_object (value)));
break; break;
default: default:
@@ -598,14 +595,13 @@ call_added_cb (GDBOVoiceCallManager *voice,
data->properties = properties; data->properties = properties;
g_variant_ref (properties); g_variant_ref (properties);
gdbo_voice_call_proxy_new gdbo_voice_call_proxy_new (self->connection,
(self->connection, G_DBUS_PROXY_FLAGS_NONE,
G_DBUS_PROXY_FLAGS_NONE, g_dbus_proxy_get_name (G_DBUS_PROXY (voice)),
g_dbus_proxy_get_name (G_DBUS_PROXY (voice)), path,
path, NULL,
NULL, (GAsyncReadyCallback) voice_call_proxy_new_cb,
(GAsyncReadyCallback) voice_call_proxy_new_cb, data);
data);
g_debug ("Call `%s' addition in progress", path); g_debug ("Call `%s' addition in progress", path);
} }
@@ -660,8 +656,10 @@ get_calls_cb (GDBOVoiceCallManager *voice,
const gchar *path; const gchar *path;
GVariant *properties; GVariant *properties;
ok = gdbo_voice_call_manager_call_get_calls_finish ok = gdbo_voice_call_manager_call_get_calls_finish (voice,
(voice, &calls_with_properties, res, &error); &calls_with_properties,
res,
&error);
if (!ok) { if (!ok) {
g_warning ("Error getting calls from oFono" g_warning ("Error getting calls from oFono"
" VoiceCallManager `%s': %s", " VoiceCallManager `%s': %s",
@@ -697,8 +695,7 @@ voice_new_cb (GDBusConnection *connection,
{ {
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
self->voice = gdbo_voice_call_manager_proxy_new_finish self->voice = gdbo_voice_call_manager_proxy_new_finish (res, &error);
(res, &error);
if (!self->voice) { if (!self->voice) {
g_warning ("Error creating oFono" g_warning ("Error creating oFono"
" VoiceCallManager `%s' proxy: %s", " VoiceCallManager `%s' proxy: %s",
@@ -756,14 +753,13 @@ constructed (GObject *object)
if (name) if (name)
self->name = g_strdup (name); self->name = g_strdup (name);
gdbo_voice_call_manager_proxy_new gdbo_voice_call_manager_proxy_new (self->connection,
(self->connection, G_DBUS_PROXY_FLAGS_NONE,
G_DBUS_PROXY_FLAGS_NONE, g_dbus_proxy_get_name (modem_proxy),
g_dbus_proxy_get_name (modem_proxy), g_dbus_proxy_get_object_path (modem_proxy),
g_dbus_proxy_get_object_path (modem_proxy), NULL,
NULL, (GAsyncReadyCallback) voice_new_cb,
(GAsyncReadyCallback) voice_new_cb, self);
self);
G_OBJECT_CLASS (calls_ofono_origin_parent_class)->constructed (object); G_OBJECT_CLASS (calls_ofono_origin_parent_class)->constructed (object);

24
plugins/provider/ofono/calls-ofono-provider.c
View File

@@ -321,14 +321,13 @@ modem_added_cb (GDBOManager *manager,
g_variant_ref (data->ifaces); g_variant_ref (data->ifaces);
} }
gdbo_modem_proxy_new gdbo_modem_proxy_new (self->connection,
(self->connection, G_DBUS_PROXY_FLAGS_NONE,
G_DBUS_PROXY_FLAGS_NONE, g_dbus_proxy_get_name (G_DBUS_PROXY (manager)),
g_dbus_proxy_get_name (G_DBUS_PROXY (manager)), path,
path, NULL,
NULL, (GAsyncReadyCallback) modem_proxy_new_cb,
(GAsyncReadyCallback) modem_proxy_new_cb, data);
data);
g_debug ("Modem `%s' addition in progress", path); 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_signal_connect (self->manager, "modem-removed",
G_CALLBACK (modem_removed_cb), self); G_CALLBACK (modem_removed_cb), self);
gdbo_manager_call_get_modems gdbo_manager_call_get_modems (self->manager,
(self->manager, NULL,
NULL, (GAsyncReadyCallback) get_modems_cb,
(GAsyncReadyCallback) get_modems_cb, self);
self);
} }