1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-12-12 07:37:35 +00:00

codestyle: new-call-box

This commit is contained in:
Evangelos Ribeiro Tzaras 2021-04-16 04:18:15 +02:00
parent d65284acaa
commit c2c3f64102

View file

@ -51,7 +51,7 @@ G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_BOX);
static CallsOrigin * static CallsOrigin *
get_origin (CallsNewCallBox *self) get_origin (CallsNewCallBox *self)
{ {
g_autoptr(CallsOrigin) origin = NULL; g_autoptr (CallsOrigin) origin = NULL;
GListModel *model; GListModel *model;
int index = -1; int index = -1;
@ -147,9 +147,7 @@ dial_queued (CallsNewCallBox *self)
CallsOrigin *origin; CallsOrigin *origin;
if (!self->dial_queue) if (!self->dial_queue)
{ return;
return;
}
g_debug ("Dialing %u queued targets", g_debug ("Dialing %u queued targets",
g_list_length (self->dial_queue)); g_list_length (self->dial_queue));
@ -158,7 +156,7 @@ dial_queued (CallsNewCallBox *self)
g_assert (origin != NULL); g_assert (origin != NULL);
g_list_foreach (self->dial_queue, g_list_foreach (self->dial_queue,
(GFunc)dial_queued_cb, (GFunc) dial_queued_cb,
origin); origin);
clear_dial_queue (self); clear_dial_queue (self);
@ -209,13 +207,12 @@ provider_changed_cb (CallsNewCallBox *self)
g_assert (CALLS_IS_NEW_CALL_BOX (self)); g_assert (CALLS_IS_NEW_CALL_BOX (self));
origins = calls_manager_get_origins (calls_manager_get_default ()); origins = calls_manager_get_origins (calls_manager_get_default ());
if (origins) if (origins) {
{ g_signal_connect_object (origins, "items-changed",
g_signal_connect_object (origins, "items-changed", G_CALLBACK (origin_count_changed_cb), self,
G_CALLBACK (origin_count_changed_cb), self, G_CONNECT_SWAPPED);
G_CONNECT_SWAPPED);
origin_count_changed_cb (self); origin_count_changed_cb (self);
} }
} }
@ -284,14 +281,13 @@ calls_new_call_box_dial (CallsNewCallBox *self,
g_return_if_fail (target != NULL); g_return_if_fail (target != NULL);
origin = get_origin (self); origin = get_origin (self);
if (!origin) if (!origin) {
{ // Queue for dialing when an origin appears
// Queue for dialing when an origin appears g_debug ("Can't submit call with no origin, queuing for later");
g_debug ("Can't submit call with no origin, queuing for later"); self->dial_queue = g_list_append (self->dial_queue,
self->dial_queue = g_list_append (self->dial_queue, g_strdup (target));
g_strdup (target)); return;
return; }
}
calls_origin_dial (origin, target); calls_origin_dial (origin, target);
} }
@ -315,19 +311,17 @@ calls_new_call_box_send_ussd_async (CallsNewCallBox *self,
task = g_task_new (self, cancellable, callback, user_data); task = g_task_new (self, cancellable, callback, user_data);
if (!CALLS_IS_USSD (origin)) if (!CALLS_IS_USSD (origin)) {
{ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "No origin with USSD available");
"No origin with USSD available"); return;
return; }
}
if (!calls_number_is_ussd (target)) if (!calls_number_is_ussd (target)) {
{ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "%s is not a valid USSD code", target);
"%s is not a valid USSD code", target); return;
return; }
}
calls_ussd_initiate_async (CALLS_USSD (origin), target, cancellable, calls_ussd_initiate_async (CALLS_USSD (origin), target, cancellable,
ussd_send_cb, g_steal_pointer (&task)); ussd_send_cb, g_steal_pointer (&task));