diff options
| author | Javier Jardón <jjardon@gnome.org> | 2012-01-02 16:30:11 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2012-01-03 16:53:47 +0100 |
| commit | 928d2cea616db45a1a0d870fd73aed2570170288 (patch) | |
| tree | 3a084b66b1681592eafec8246002fadb149e068a /gio/gunixvolumemonitor.c | |
| parent | dde3401122930355f665af25292ad1b639e98390 (diff) | |
gio/*: Use g_list_free_full() convenience function
Diffstat (limited to 'gio/gunixvolumemonitor.c')
| -rw-r--r-- | gio/gunixvolumemonitor.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c index 76a984035..26ec48369 100644 --- a/gio/gunixvolumemonitor.c +++ b/gio/gunixvolumemonitor.c @@ -76,15 +76,11 @@ g_unix_volume_monitor_finalize (GObject *object) g_object_unref (monitor->mount_monitor); - g_list_foreach (monitor->last_mountpoints, (GFunc)g_unix_mount_point_free, NULL); - g_list_free (monitor->last_mountpoints); - g_list_foreach (monitor->last_mounts, (GFunc)g_unix_mount_free, NULL); - g_list_free (monitor->last_mounts); + g_list_free_full (monitor->last_mountpoints, (GDestroyNotify) g_unix_mount_point_free); + g_list_free_full (monitor->last_mounts, (GDestroyNotify) g_unix_mount_free); - g_list_foreach (monitor->volumes, (GFunc)g_object_unref, NULL); - g_list_free (monitor->volumes); - g_list_foreach (monitor->mounts, (GFunc)g_object_unref, NULL); - g_list_free (monitor->mounts); + g_list_free_full (monitor->volumes, g_object_unref); + g_list_free_full (monitor->mounts, g_object_unref); G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->finalize (object); } @@ -95,12 +91,11 @@ g_unix_volume_monitor_dispose (GObject *object) GUnixVolumeMonitor *monitor; monitor = G_UNIX_VOLUME_MONITOR (object); - g_list_foreach (monitor->volumes, (GFunc)g_object_unref, NULL); - g_list_free (monitor->volumes); + + g_list_free_full (monitor->volumes, g_object_unref); monitor->volumes = NULL; - g_list_foreach (monitor->mounts, (GFunc)g_object_unref, NULL); - g_list_free (monitor->mounts); + g_list_free_full (monitor->mounts, g_object_unref); monitor->mounts = NULL; G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->dispose (object); @@ -372,9 +367,7 @@ update_volumes (GUnixVolumeMonitor *monitor) g_list_free (added); g_list_free (removed); - g_list_foreach (monitor->last_mountpoints, - (GFunc)g_unix_mount_point_free, NULL); - g_list_free (monitor->last_mountpoints); + g_list_free_full (monitor->last_mountpoints, (GDestroyNotify) g_unix_mount_point_free); monitor->last_mountpoints = new_mountpoints; } @@ -428,8 +421,6 @@ update_mounts (GUnixVolumeMonitor *monitor) g_list_free (added); g_list_free (removed); - g_list_foreach (monitor->last_mounts, - (GFunc)g_unix_mount_free, NULL); - g_list_free (monitor->last_mounts); + g_list_free_full (monitor->last_mounts, (GDestroyNotify) g_unix_mount_free); monitor->last_mounts = new_mounts; } |