Fix volumemonitor test case

Don't blindly g_object_unref() that which may be NULL.
This commit is contained in:
Ryan Lortie 2010-08-06 13:12:20 -04:00
parent 889a7f81dd
commit b91f9274d9

View File

@ -16,11 +16,13 @@ do_mount_tests (GDrive *drive, GVolume *volume, GMount *mount)
v = g_mount_get_volume (mount); v = g_mount_get_volume (mount);
g_assert (v == volume); g_assert (v == volume);
g_object_unref (v); if (v != NULL)
g_object_unref (v);
d = g_mount_get_drive (mount); d = g_mount_get_drive (mount);
g_assert (d == drive); g_assert (d == drive);
g_object_unref (d); if (d != NULL)
g_object_unref (d);
uuid = g_mount_get_uuid (mount); uuid = g_mount_get_uuid (mount);
if (uuid) if (uuid)
@ -147,8 +149,11 @@ test_mounts (void)
drive = g_mount_get_drive (mount); drive = g_mount_get_drive (mount);
volume = g_mount_get_volume (mount); volume = g_mount_get_volume (mount);
do_mount_tests (drive, volume, mount); do_mount_tests (drive, volume, mount);
g_object_unref (drive);
g_object_unref (volume); if (drive != NULL)
g_object_unref (drive);
if (volume != NULL)
g_object_unref (volume);
} }
g_list_foreach (mounts, (GFunc)g_object_unref, NULL); g_list_foreach (mounts, (GFunc)g_object_unref, NULL);