mirror of
https://gitlab.freedesktop.org/upower/upower.git
synced 2026-05-04 09:27:59 +02:00
main: Use g_clear_object() when possible
Rather than using != NULL, followed by unref(). https://bugs.freedesktop.org/show_bug.cgi?id=103380
This commit is contained in:
parent
b3f39a5ca3
commit
296f5855d0
1 changed files with 3 additions and 8 deletions
|
|
@ -464,10 +464,7 @@ void
|
|||
up_device_unplug (UpDevice *device)
|
||||
{
|
||||
/* break circular dependency */
|
||||
if (device->priv->daemon != NULL) {
|
||||
g_object_unref (device->priv->daemon);
|
||||
device->priv->daemon = NULL;
|
||||
}
|
||||
g_clear_object (&device->priv->daemon);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -717,10 +714,8 @@ up_device_finalize (GObject *object)
|
|||
|
||||
device = UP_DEVICE (object);
|
||||
g_return_if_fail (device->priv != NULL);
|
||||
if (device->priv->native != NULL)
|
||||
g_object_unref (device->priv->native);
|
||||
if (device->priv->daemon != NULL)
|
||||
g_object_unref (device->priv->daemon);
|
||||
g_clear_object (&device->priv->native);
|
||||
g_clear_object (&device->priv->daemon);
|
||||
g_object_unref (device->priv->history);
|
||||
|
||||
G_OBJECT_CLASS (up_device_parent_class)->finalize (object);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue