Gio::Mount: Move enums into class.

9 files changed, 116 insertions, 116 deletions

diff --git a/gio/src/drive.ccg b/gio/src/drive.ccg
index c75dd14d..343de175 100644
--- a/gio/src/drive.ccg
+++ b/gio/src/drive.ccg
@@ -28,7 +28,7 @@ namespace Gio
 
 void
 Drive::eject(
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -41,7 +41,7 @@ Drive::eject(
 }
 
 void
-Drive::eject(const SlotAsyncReady& slot, MountUnmountFlags flags)
+Drive::eject(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -56,7 +56,7 @@ Drive::eject(const SlotAsyncReady& slot, MountUnmountFlags flags)
 
 void
 Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -70,7 +70,7 @@ Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
 
 void
 Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  MountUnmountFlags flags)
+  Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -84,7 +84,7 @@ Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
 }
 
 void
-Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   g_drive_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     Glib::unwrap(mount_operation),
@@ -94,7 +94,7 @@ Drive::eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFl
 }
 
 void
-Drive::eject(MountUnmountFlags flags)
+Drive::eject(Mount::UnmountFlags flags)
 {
   g_drive_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     nullptr, // mount_operation
@@ -137,7 +137,7 @@ Drive::poll_for_media()
 
 void
 Drive::stop(const Glib::RefPtr<MountOperation>& mount_operation,
-  const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -150,7 +150,7 @@ Drive::stop(const Glib::RefPtr<MountOperation>& mount_operation,
 
 void
 Drive::stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  MountUnmountFlags flags)
+  Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index f754b52a..6faf978e 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -76,21 +76,21 @@ public:
    * @param flags Flags affecting the unmount if required for eject.
    * @param cancellable A cancellable object which can be used to cancel the eject.
    */
-  void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Ejects the drive.
    * @param slot A callback which will be called when the eject is completed.
    * @param flags Flags affecting the unmount if required for eject.
    */
-  void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject(const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Ejects the drive.
    * @param flags Flags affecting the unmount if required for eject.
    */
-  void eject(MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject(Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
   _IGNORE(g_drive_eject)
   _IGNORE(g_drive_eject_with_operation)
 
@@ -140,9 +140,9 @@ public:
   _WRAP_METHOD(bool can_start_degraded() const, g_drive_can_start_degraded)
 
   /** @newin{2,22} */
-  void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
   /** @newin{2,22} */
-  void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
   _IGNORE(g_drive_stop)
   _WRAP_METHOD(bool stop_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_stop_finish, errthrow)
   /** @newin{2,22} */
diff --git a/gio/src/file.ccg b/gio/src/file.ccg
index 074eda94..4312c536 100644
--- a/gio/src/file.ccg
+++ b/gio/src/file.ccg
@@ -805,7 +805,7 @@ File::set_attributes_finish(
 
 void
 File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -819,7 +819,7 @@ File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
 
 void
 File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
-  const SlotAsyncReady& slot, MountMountFlags flags)
+  const SlotAsyncReady& slot, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -831,7 +831,7 @@ File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
 }
 
 void
-File::mount_mountable(const SlotAsyncReady& slot, MountMountFlags flags)
+File::mount_mountable(const SlotAsyncReady& slot, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -843,7 +843,7 @@ File::mount_mountable(const SlotAsyncReady& slot, MountMountFlags flags)
 }
 
 void
-File::mount_mountable(MountMountFlags flags)
+File::mount_mountable(Mount::MountFlags flags)
 {
   g_file_mount_mountable(
     gobj(), static_cast<GMountMountFlags>(flags), nullptr, nullptr, nullptr, nullptr);
@@ -851,7 +851,7 @@ File::mount_mountable(MountMountFlags flags)
 
 void
 File::unmount_mountable(
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -863,7 +863,7 @@ File::unmount_mountable(
 }
 
 void
-File::unmount_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags)
+File::unmount_mountable(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -875,7 +875,7 @@ File::unmount_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags)
 }
 
 void
-File::unmount_mountable(MountUnmountFlags flags)
+File::unmount_mountable(Mount::UnmountFlags flags)
 {
   g_file_unmount_mountable_with_operation(
     gobj(), static_cast<GMountUnmountFlags>(flags), nullptr, nullptr, nullptr, nullptr);
@@ -883,7 +883,7 @@ File::unmount_mountable(MountUnmountFlags flags)
 
 void
 File::unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -897,7 +897,7 @@ File::unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellab
 
 void
 File::unmount_mountable(const SlotAsyncReady& slot,
-  const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -910,7 +910,7 @@ File::unmount_mountable(const SlotAsyncReady& slot,
 
 void
 File::unmount_mountable(
-  const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   g_file_unmount_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     Glib::unwrap(mount_operation), nullptr, nullptr, nullptr);
@@ -918,7 +918,7 @@ File::unmount_mountable(
 
 void
 File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation,
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -932,7 +932,7 @@ File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation
 
 void
 File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation,
-  const SlotAsyncReady& slot, MountMountFlags flags)
+  const SlotAsyncReady& slot, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -944,7 +944,7 @@ File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation
 }
 
 void
-File::mount_enclosing_volume(const SlotAsyncReady& slot, MountMountFlags flags)
+File::mount_enclosing_volume(const SlotAsyncReady& slot, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -956,7 +956,7 @@ File::mount_enclosing_volume(const SlotAsyncReady& slot, MountMountFlags flags)
 }
 
 void
-File::mount_enclosing_volume(MountMountFlags flags)
+File::mount_enclosing_volume(Mount::MountFlags flags)
 {
   g_file_mount_enclosing_volume(
     gobj(), static_cast<GMountMountFlags>(flags), nullptr, nullptr, nullptr, nullptr);
@@ -964,7 +964,7 @@ File::mount_enclosing_volume(MountMountFlags flags)
 
 void
 File::eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -978,7 +978,7 @@ File::eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable
 
 void
 File::eject_mountable(const SlotAsyncReady& slot,
-  const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -990,7 +990,7 @@ File::eject_mountable(const SlotAsyncReady& slot,
 }
 
 void
-File::eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+File::eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   g_file_eject_mountable_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     Glib::unwrap(mount_operation), nullptr, nullptr, nullptr);
@@ -998,7 +998,7 @@ File::eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, Mount
 
 void
 File::eject_mountable(
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -1010,7 +1010,7 @@ File::eject_mountable(
 }
 
 void
-File::eject_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags)
+File::eject_mountable(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -1022,7 +1022,7 @@ File::eject_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags)
 }
 
 void
-File::eject_mountable(MountUnmountFlags flags)
+File::eject_mountable(Mount::UnmountFlags flags)
 {
   g_file_eject_mountable_with_operation(
     gobj(), static_cast<GMountUnmountFlags>(flags), nullptr, nullptr, nullptr, nullptr);
@@ -1457,7 +1457,7 @@ File::start_mountable(const SlotAsyncReady& slot,
 
 void
 File::stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
-  const Glib::RefPtr<MountOperation>& start_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& start_operation, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -1470,7 +1470,7 @@ File::stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>
 
 void
 File::stop_mountable(const SlotAsyncReady& slot,
-  const Glib::RefPtr<MountOperation>& start_operation, MountUnmountFlags flags)
+  const Glib::RefPtr<MountOperation>& start_operation, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
diff --git a/gio/src/file.hg b/gio/src/file.hg
index f40dedc7..6ae3aa13 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -1436,7 +1436,7 @@ public:
    * @param cancellable A Cancellable object.
    * @param flags Flags affecting the operation.
    */
-  void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
+  void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Starts a @a mount_operation, mounting the volume that contains the file.
    *
@@ -1447,7 +1447,7 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
+  void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Starts a @a mount_operation, mounting the volume that contains the file.
    *
@@ -1457,14 +1457,14 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void mount_enclosing_volume(const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
+  void mount_enclosing_volume(const SlotAsyncReady& slot, Mount::MountFlags flags = Mount::MountFlags::NONE);
   _IGNORE(g_file_mount_enclosing_volume)
 
   /** Starts a @a mount_operation, mounting the volume that contains the file.
    *
    * @param flags Flags affecting the operation.
    */
-  void mount_enclosing_volume(MountMountFlags flags = MountMountFlags::NONE);
+  void mount_enclosing_volume(Mount::MountFlags flags = Mount::MountFlags::NONE);
   _IGNORE(g_file_mount_enclosing_volume)
 
   _WRAP_METHOD(bool mount_enclosing_volume_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -1484,7 +1484,7 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
+  void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Mounts a file of type FILE_TYPE_MOUNTABLE. Using @a mount_operation, you can request callbacks when, for instance,
    * passwords are needed during authentication.
@@ -1495,7 +1495,7 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
+  void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Mounts a file of type FILE_TYPE_MOUNTABLE without user interaction.
    *
@@ -1504,13 +1504,13 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void mount_mountable(const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
+  void mount_mountable(const SlotAsyncReady& slot, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Mounts a file of type FILE_TYPE_MOUNTABLE without user interaction.
    *
    * @param flags Flags affecting the operation.
    */
-  void mount_mountable(MountMountFlags flags = MountMountFlags::NONE);
+  void mount_mountable(Mount::MountFlags flags = Mount::MountFlags::NONE);
   _IGNORE(g_file_mount_mountable)
 
   _WRAP_METHOD(Glib::RefPtr<File> mount_mountable_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -1528,7 +1528,7 @@ public:
    * @param cancellable A Cancellable object which can be used to cancel the operation.
    * @param flags Flags affecting the operation.
    */
-  void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Unmounts a file of type FILE_TYPE_MOUNTABLE.
    *
@@ -1537,13 +1537,13 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void unmount_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount_mountable(const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Unmounts a file of type FILE_TYPE_MOUNTABLE.
    *
    * @param flags Flags affecting the operation.
    */
-  void unmount_mountable(MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount_mountable(Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Unmounts a file of type FILE_TYPE_MOUNTABLE.
    *
@@ -1559,7 +1559,7 @@ public:
    *
    * @newin{2,24}
    */
-  void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Unmounts a file of type FILE_TYPE_MOUNTABLE.
    *
@@ -1571,7 +1571,7 @@ public:
    *
    * @newin{2,24}
    */
-  void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Unmounts a file of type FILE_TYPE_MOUNTABLE.
    *
@@ -1580,7 +1580,7 @@ public:
    *
    * @newin{2,24}
    */
-  void unmount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   _IGNORE(g_file_unmount_mountable, g_file_unmount_mountable_finish, g_file_unmount_mountable_with_operation)
 
@@ -1599,7 +1599,7 @@ public:
    * @param cancellable A Cancellable object which can be used to cancel the operation.
    * @param flags Flags affecting the operation.
    */
-  void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Starts an asynchronous eject on a mountable.
    *
@@ -1608,13 +1608,13 @@ public:
    * @param slot A callback slot which will be called when the request is satisfied.
    * @param flags Flags affecting the operation.
    */
-  void eject_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject_mountable(const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Starts an asynchronous eject on a mountable.
    *
    * @param flags Flags affecting the operation.
    */
-  void eject_mountable(MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject_mountable(Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Starts an asynchronous eject on a mountable.
    *
@@ -1630,7 +1630,7 @@ public:
    *
    * @newin{2,24}
    */
-  void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Starts an asynchronous eject on a mountable.
    *
@@ -1642,7 +1642,7 @@ public:
    *
    * @newin{2,24}
    */
-  void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   /** Starts an asynchronous eject on a mountable.
    *
@@ -1651,7 +1651,7 @@ public:
    *
    * @newin{2,24}
    */
-  void eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
   _IGNORE(g_file_eject_mountable, g_file_eject_mountable_finish, g_file_eject_mountable_with_operation)
 
@@ -1923,7 +1923,7 @@ public:
   *
   * @newin{2,24}
   */
-  void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& start_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& start_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
 
 
  /** Stops a file of type Mountable.
@@ -1943,7 +1943,7 @@ public:
   *
   * @newin{2,24}
   */
-  void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& start_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& start_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
   _IGNORE(g_file_stop_mountable)
 
   _WRAP_METHOD(bool stop_mountable_finish(const Glib::RefPtr<AsyncResult>& result),
diff --git a/gio/src/mount.ccg b/gio/src/mount.ccg
index 6b78a8b2..2ba1001c 100644
--- a/gio/src/mount.ccg
+++ b/gio/src/mount.ccg
@@ -29,7 +29,7 @@ namespace Gio
 
 void
 Mount::unmount(
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -42,7 +42,7 @@ Mount::unmount(
 }
 
 void
-Mount::unmount(const SlotAsyncReady& slot, MountUnmountFlags flags)
+Mount::unmount(const SlotAsyncReady& slot, UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -56,7 +56,7 @@ Mount::unmount(const SlotAsyncReady& slot, MountUnmountFlags flags)
 }
 
 void
-Mount::unmount(MountUnmountFlags flags)
+Mount::unmount(UnmountFlags flags)
 {
   g_mount_unmount_with_operation(gobj(), GMountUnmountFlags(flags),
     nullptr, // mount_operation
@@ -67,7 +67,7 @@ Mount::unmount(MountUnmountFlags flags)
 
 void
 Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -80,7 +80,7 @@ Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAs
 
 void
 Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  MountUnmountFlags flags)
+  UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -93,7 +93,7 @@ Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAs
 }
 
 void
-Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, UnmountFlags flags)
 {
   g_mount_unmount_with_operation(gobj(), GMountUnmountFlags(flags), Glib::unwrap(mount_operation),
     nullptr, // cancellable
@@ -103,7 +103,7 @@ Mount::unmount(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmount
 
 void
 Mount::remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -116,7 +116,7 @@ Mount::remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncRea
 
 void
 Mount::remount(
-  const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, MountMountFlags flags)
+  const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -128,21 +128,21 @@ Mount::remount(
 }
 
 void
-Mount::remount(const Glib::RefPtr<MountOperation>& operation, MountMountFlags flags)
+Mount::remount(const Glib::RefPtr<MountOperation>& operation, MountFlags flags)
 {
   g_mount_remount(gobj(), static_cast<GMountMountFlags>(flags), Glib::unwrap(operation), nullptr,
     nullptr, nullptr);
 }
 
 void
-Mount::remount(MountMountFlags flags)
+Mount::remount(MountFlags flags)
 {
   g_mount_remount(gobj(), static_cast<GMountMountFlags>(flags), nullptr, nullptr, nullptr, nullptr);
 }
 
 void
 Mount::eject(
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -155,7 +155,7 @@ Mount::eject(
 }
 
 void
-Mount::eject(const SlotAsyncReady& slot, MountUnmountFlags flags)
+Mount::eject(const SlotAsyncReady& slot, UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -169,7 +169,7 @@ Mount::eject(const SlotAsyncReady& slot, MountUnmountFlags flags)
 }
 
 void
-Mount::eject(MountUnmountFlags flags)
+Mount::eject(UnmountFlags flags)
 {
   g_mount_eject_with_operation(gobj(), GMountUnmountFlags(flags),
     nullptr, // mount_operation
@@ -180,7 +180,7 @@ Mount::eject(MountUnmountFlags flags)
 
 void
 Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -193,7 +193,7 @@ Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
 
 void
 Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  MountUnmountFlags flags)
+  UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -206,7 +206,7 @@ Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyn
 }
 
 void
-Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+Mount::eject(const Glib::RefPtr<MountOperation>& mount_operation, UnmountFlags flags)
 {
   g_mount_eject_with_operation(gobj(), GMountUnmountFlags(flags), Glib::unwrap(mount_operation),
     nullptr, // cancellable
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 89a8dbea..3356ec37 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -35,8 +35,6 @@ typedef struct _GMountIface GMountIface;
 namespace Gio
 {
 
-_WRAP_ENUM(MountUnmountFlags, GMountUnmountFlags, NO_GTYPE)
-_WRAP_ENUM(MountMountFlags, GMountMountFlags, NO_GTYPE)
 
 class File;
 class Drive;
@@ -59,6 +57,8 @@ class Mount : public Glib::Interface
   _CLASS_INTERFACE(Mount, GMount, G_MOUNT, GMountIface)
 
 public:
+  _WRAP_ENUM(UnmountFlags, GMountUnmountFlags, NO_GTYPE)
+  _WRAP_ENUM(MountFlags, GMountMountFlags, NO_GTYPE)
 
   _WRAP_METHOD(Glib::RefPtr<File> get_root(), g_mount_get_root, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const File> get_root() const, g_mount_get_root, refreturn, constversion)
@@ -82,12 +82,12 @@ public:
   _WRAP_METHOD(bool can_unmount() const, g_mount_can_unmount)
   _WRAP_METHOD(bool can_eject() const, g_mount_can_eject)
 
-  void unmount(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void unmount(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void unmount(MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void unmount(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void unmount(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags = UnmountFlags::NONE);
+  void unmount(const SlotAsyncReady& slot, UnmountFlags flags = UnmountFlags::NONE);
+  void unmount(UnmountFlags flags = UnmountFlags::NONE);
+  void unmount(const Glib::RefPtr<MountOperation>& mount_operation, UnmountFlags flags = UnmountFlags::NONE);
+  void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, UnmountFlags flags = UnmountFlags::NONE);
+  void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags = UnmountFlags::NONE);
   _IGNORE(g_mount_unmount)
   _IGNORE(g_mount_unmount_with_operation)
 
@@ -106,7 +106,7 @@ public:
    * @param cancellable A cancellable object which can be used to cancel the operation.
    * @param flags Flags affecting the operation.
    */
-  void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
+  void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountFlags flags = MountFlags::NONE);
 
   /** Remounts a mount.
    * This is an asynchronous operation, and is finished by calling mount_finish() with the AsyncResult data returned in the callback slot.
@@ -119,7 +119,7 @@ public:
    * @param slot A callback which will be called when the operation is completed or canceled.
    * @param flags Flags affecting the operation.
    */
-  void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
+  void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, MountFlags flags = MountFlags::NONE);
 
   /** Remounts a mount.
    *
@@ -130,7 +130,7 @@ public:
    * @param operation A mount operation.
    * @param flags Flags affecting the operation.
    */
-  void remount(const Glib::RefPtr<MountOperation>& operation, MountMountFlags flags = MountMountFlags::NONE);
+  void remount(const Glib::RefPtr<MountOperation>& operation, MountFlags flags = MountFlags::NONE);
 
   /** Remounts a mount, without user interaction.
    *
@@ -140,18 +140,18 @@ public:
    *
    * @param flags Flags affecting the operation.
    */
-  void remount(MountMountFlags flags = MountMountFlags::NONE);
+  void remount(MountFlags flags = MountFlags::NONE);
   _IGNORE(g_mount_remount)
 
 
   _WRAP_METHOD(bool remount_finish(const Glib::RefPtr<AsyncResult>& result), g_mount_remount_finish, errthrow)
 
-  void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags = UnmountFlags::NONE);
+  void eject(const SlotAsyncReady& slot, UnmountFlags flags = UnmountFlags::NONE);
+  void eject(UnmountFlags flags = UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, UnmountFlags flags = UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, UnmountFlags flags = UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, UnmountFlags flags = UnmountFlags::NONE);
   _IGNORE(g_mount_eject)
   _IGNORE(g_mount_eject_with_operation)
 
diff --git a/gio/src/volume.ccg b/gio/src/volume.ccg
index 9d61a520..9ba18981 100644
--- a/gio/src/volume.ccg
+++ b/gio/src/volume.ccg
@@ -29,7 +29,7 @@ namespace Gio
 
 void
 Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -42,7 +42,7 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
 
 void
 Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  MountMountFlags flags)
+  Mount::MountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -55,7 +55,7 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
 }
 
 void
-Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, MountMountFlags flags)
+Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, Mount::MountFlags flags)
 {
   g_volume_mount(gobj(), static_cast<GMountMountFlags>(flags), Glib::unwrap(mount_operation),
     nullptr, // cancellable
@@ -63,7 +63,7 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, MountMountFla
 }
 
 void
-Volume::mount(MountMountFlags flags)
+Volume::mount(Mount::MountFlags flags)
 {
   g_volume_mount(gobj(), static_cast<GMountMountFlags>(flags), nullptr,
     nullptr, // cancellable
@@ -72,7 +72,7 @@ Volume::mount(MountMountFlags flags)
 
 void
 Volume::eject(
-  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -85,7 +85,7 @@ Volume::eject(
 }
 
 void
-Volume::eject(const SlotAsyncReady& slot, MountUnmountFlags flags)
+Volume::eject(const SlotAsyncReady& slot, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -99,7 +99,7 @@ Volume::eject(const SlotAsyncReady& slot, MountUnmountFlags flags)
 }
 
 void
-Volume::eject(MountUnmountFlags flags)
+Volume::eject(Mount::UnmountFlags flags)
 {
   g_volume_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     nullptr, // mount_operation
@@ -110,7 +110,7 @@ Volume::eject(MountUnmountFlags flags)
 
 void
 Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
+  const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -124,7 +124,7 @@ Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
 
 void
 Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
-  MountUnmountFlags flags)
+  Mount::UnmountFlags flags)
 {
   // Create a copy of the slot.
   // A pointer to it will be passed through the callback's data parameter
@@ -138,7 +138,7 @@ Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
 }
 
 void
-Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
+Volume::eject(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags)
 {
   g_volume_eject_with_operation(gobj(), static_cast<GMountUnmountFlags>(flags),
     Glib::unwrap(mount_operation),
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index feac4261..f6339c90 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -98,7 +98,7 @@ public:
    * @param cancellable A cancellable object which can be used to cancel the operation.
    * @param flags Flags affecting the operation.
    */
-  void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
+  void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Mounts a volume.
    * This is an asynchronous operation, and is finished by calling mount_finish() with the AsyncResult data returned in the callback slot.
@@ -107,20 +107,20 @@ public:
    * @param slot A callback which will be called when the operation is completed or canceled.
    * @param flags Flags affecting the operation.
    */
-  void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
+  void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Mounts a volume.
    *
    * @param mount_operation A mount operation.
    * @param flags Flags affecting the operation.
    */
-  void mount(const Glib::RefPtr<MountOperation>& mount_operation, MountMountFlags flags = MountMountFlags::NONE);
+  void mount(const Glib::RefPtr<MountOperation>& mount_operation, Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   /** Mounts a volume.
    *
    * @param flags Flags affecting the operation.
    */
-  void mount(MountMountFlags flags = MountMountFlags::NONE);
+  void mount(Mount::MountFlags flags = Mount::MountFlags::NONE);
 
   _IGNORE(g_volume_mount)
 
@@ -128,12 +128,12 @@ public:
                g_volume_mount_finish,
                errthrow)
 
-  void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
-  void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
+  void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
+  void eject(const Glib::RefPtr<MountOperation>& mount_operation, Mount::UnmountFlags flags = Mount::UnmountFlags::NONE);
   _IGNORE(g_volume_eject)
   _IGNORE(g_volume_eject_with_operation)
 
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index 445636a5..91f2593d 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -55,9 +55,9 @@ _CONV_GIO_INCLASS_ENUM(FileMonitor,Event)
 _CONV_GIO_INCLASS_ENUM(FileMonitor,Flags)
 _CONV_GIO_ENUM(FileQueryInfoFlags)
 _CONV_GIO_ENUM(FileType)
-_CONV_GIO_ENUM(MountMountFlags)
+_CONV_GIO_INCLASS_ENUM(Mount,MountFlags)
 _CONV_GIO_ENUM(MountOperationResult)
-_CONV_GIO_ENUM(MountUnmountFlags)
+_CONV_GIO_INCLASS_ENUM(Mount,UnmountFlags)
 _CONV_GIO_ENUM(NetworkConnectivity)
 _CONV_GIO_INCLASS_ENUM(Notification,Priority)
 _CONV_GIO_INCLASS_ENUM(OutputStream,SpliceFlags)