mirror of
https://gitlab.gnome.org/GNOME/calls.git
synced 2025-01-07 12:25:31 +00:00
ofono: don't clear self->modem after constructing CallsOfonoOrigin
self->modem is used in calls_ofono_origin_matches; in that context, warn if it is NULL
This commit is contained in:
parent
9b4563e046
commit
cc93733c42
1 changed files with 1 additions and 5 deletions
|
@ -117,9 +117,7 @@ calls_ofono_origin_matches (CallsOfonoOrigin *self,
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (CALLS_IS_OFONO_ORIGIN (self), FALSE);
|
g_return_val_if_fail (CALLS_IS_OFONO_ORIGIN (self), FALSE);
|
||||||
g_return_val_if_fail (path, FALSE);
|
g_return_val_if_fail (path, FALSE);
|
||||||
|
g_return_val_if_fail (self->modem, FALSE);
|
||||||
if (!self->modem)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
return g_strcmp0 (g_dbus_proxy_get_object_path (G_DBUS_PROXY (self->modem)), path) == 0;
|
return g_strcmp0 (g_dbus_proxy_get_object_path (G_DBUS_PROXY (self->modem)), path) == 0;
|
||||||
}
|
}
|
||||||
|
@ -504,8 +502,6 @@ constructed (GObject *object)
|
||||||
(GAsyncReadyCallback)voice_new_cb,
|
(GAsyncReadyCallback)voice_new_cb,
|
||||||
self);
|
self);
|
||||||
|
|
||||||
g_clear_object (&self->modem);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (calls_ofono_origin_parent_class)->constructed (object);
|
G_OBJECT_CLASS (calls_ofono_origin_parent_class)->constructed (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue