udisks2: Remove some gdu leftovers

udisks2 volume monitor contains some variables, or debug prints which
contains gdu prefixes, or functionality. Let's rename, or remove
that stuff.

3 files changed, 9 insertions, 13 deletions

diff --git a/monitor/udisks2/gvfsudisks2drive.c b/monitor/udisks2/gvfsudisks2drive.c
index de6840f6..52e9b75e 100644
--- a/monitor/udisks2/gvfsudisks2drive.c
+++ b/monitor/udisks2/gvfsudisks2drive.c
@@ -113,7 +113,7 @@ gvfs_udisks2_drive_class_init (GVfsUDisks2DriveClass *klass)
 }
 
 static void
-gvfs_udisks2_drive_init (GVfsUDisks2Drive *gdu_drive)
+gvfs_udisks2_drive_init (GVfsUDisks2Drive *drive)
 {
 }
 
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
index d204e4a0..dc4351ce 100644
--- a/monitor/udisks2/gvfsudisks2volume.c
+++ b/monitor/udisks2/gvfsudisks2volume.c
@@ -803,24 +803,24 @@ gvfs_udisks2_volume_should_automount (GVolume *_volume)
 }
 
 static GDrive *
-gvfs_udisks2_volume_get_drive (GVolume *volume)
+gvfs_udisks2_volume_get_drive (GVolume *_volume)
 {
-  GVfsUDisks2Volume *gdu_volume = GVFS_UDISKS2_VOLUME (volume);
+  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
   GDrive *drive = NULL;
 
-  if (gdu_volume->drive != NULL)
-    drive = G_DRIVE (g_object_ref (gdu_volume->drive));
+  if (volume->drive != NULL)
+    drive = G_DRIVE (g_object_ref (volume->drive));
   return drive;
 }
 
 static GMount *
-gvfs_udisks2_volume_get_mount (GVolume *volume)
+gvfs_udisks2_volume_get_mount (GVolume *_volume)
 {
-  GVfsUDisks2Volume *gdu_volume = GVFS_UDISKS2_VOLUME (volume);
+  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
   GMount *mount = NULL;
 
-  if (gdu_volume->mount != NULL)
-    mount = G_MOUNT (g_object_ref (gdu_volume->mount));
+  if (volume->mount != NULL)
+    mount = G_MOUNT (g_object_ref (volume->mount));
   return mount;
 }
 
diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c
index e7abf85a..aab30c34 100644
--- a/monitor/udisks2/gvfsudisks2volumemonitor.c
+++ b/monitor/udisks2/gvfsudisks2volumemonitor.c
@@ -1316,7 +1316,6 @@ update_drives (GVfsUDisks2VolumeMonitor  *monitor,
       drive = find_drive_for_udisks_drive (monitor, udisks_drive);
       if (drive != NULL)
         {
-          /*g_debug ("removing drive %s", gdu_presentable_get_id (p));*/
           gvfs_udisks2_drive_disconnected (drive);
           monitor->drives = g_list_remove (monitor->drives, drive);
           *removed_drives = g_list_prepend (*removed_drives, g_object_ref (drive));
@@ -1331,7 +1330,6 @@ update_drives (GVfsUDisks2VolumeMonitor  *monitor,
       drive = find_drive_for_udisks_drive (monitor, udisks_drive);
       if (drive == NULL)
         {
-          /*g_debug ("adding drive %s", gdu_presentable_get_id (p));*/
           drive = gvfs_udisks2_drive_new (monitor, udisks_drive, coldplug);
           if (udisks_drive != NULL)
             {
@@ -1688,7 +1686,6 @@ update_mounts (GVfsUDisks2VolumeMonitor  *monitor,
           gvfs_udisks2_mount_unmounted (mount);
           monitor->mounts = g_list_remove (monitor->mounts, mount);
           *removed_mounts = g_list_prepend (*removed_mounts, g_object_ref (mount));
-          /*g_debug ("removed mount at %s", gvfs_udisks2_mount_get_mount_path (mount));*/
           g_object_unref (mount);
         }
     }
@@ -1704,7 +1701,6 @@ update_mounts (GVfsUDisks2VolumeMonitor  *monitor,
         {
           monitor->mounts = g_list_prepend (monitor->mounts, mount);
           *added_mounts = g_list_prepend (*added_mounts, g_object_ref (mount));
-          /*g_debug ("added mount at %s for %p", gvfs_udisks2_mount_get_mount_path (mount), volume);*/
           /* since @mount takes ownership of @mount_entry, don't free it below */
           new_mounts = g_list_remove (new_mounts, mount_entry);
         }