mirror of
https://gitlab.gnome.org/GNOME/calls.git
synced 2025-01-06 03:25:31 +00:00
calls-dummy-origin: Fix ordering of state change and call removal callbacks
This commit is contained in:
parent
f12b411813
commit
ebf579af78
2 changed files with 40 additions and 3 deletions
|
@ -108,12 +108,32 @@ remove_calls (CallsDummyOrigin *self, const gchar *reason)
|
|||
}
|
||||
|
||||
|
||||
struct DisconnectedData
|
||||
{
|
||||
CallsDummyOrigin *self;
|
||||
CallsCall *call;
|
||||
};
|
||||
|
||||
|
||||
static gboolean
|
||||
disconnected_cb (struct DisconnectedData *data)
|
||||
{
|
||||
remove_call (data->self, data->call, "Disconnected");
|
||||
g_object_unref (G_OBJECT (data->call));
|
||||
g_object_unref (G_OBJECT (data->self));
|
||||
g_free (data);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
call_state_changed_cb (CallsDummyOrigin *self,
|
||||
CallsCallState new_state,
|
||||
CallsCallState old_state,
|
||||
CallsCall *call)
|
||||
{
|
||||
struct DisconnectedData *data;
|
||||
|
||||
if (new_state != CALLS_CALL_STATE_DISCONNECTED)
|
||||
{
|
||||
return;
|
||||
|
@ -122,7 +142,16 @@ call_state_changed_cb (CallsDummyOrigin *self,
|
|||
g_return_if_fail (CALLS_IS_DUMMY_ORIGIN (self));
|
||||
g_return_if_fail (CALLS_IS_CALL (call));
|
||||
|
||||
remove_call (self, call, "Disconnected");
|
||||
// We add an idle callback so that all of the state change handlers
|
||||
// are dealt with before the removal
|
||||
|
||||
data = g_new (struct DisconnectedData, 1);
|
||||
data->self = self;
|
||||
data->call = call;
|
||||
g_object_ref (G_OBJECT (self));
|
||||
g_object_ref (G_OBJECT (call));
|
||||
|
||||
g_idle_add ((GSourceFunc)disconnected_cb, data);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -43,14 +43,22 @@ test_dummy_call_get_state (CallFixture *fixture,
|
|||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
test_dummy_call_hang_up_idle_cb (CallsDummyOrigin *origin)
|
||||
{
|
||||
g_assert_null (calls_origin_get_calls (CALLS_ORIGIN (origin)));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
test_dummy_call_hang_up (CallFixture *fixture,
|
||||
gconstpointer user_data)
|
||||
{
|
||||
calls_call_hang_up (CALLS_CALL (fixture->dummy_call));
|
||||
|
||||
g_assert_null (calls_origin_get_calls
|
||||
(CALLS_ORIGIN (fixture->parent.dummy_origin)));
|
||||
// Mirror the dummy origin's use of an idle callback
|
||||
g_idle_add ((GSourceFunc)test_dummy_call_hang_up_idle_cb,
|
||||
fixture->parent.dummy_origin);
|
||||
}
|
||||
|
||||
gint
|
||||
|
|
Loading…
Reference in a new issue