Merge pull request #1740 from fbrouille/gio_file_enumerator_subclass

Add gio::FileEnumerator subclass

Author: sdroege

gio/Gir.toml

@@ -891,6 +891,11 @@ manual_traits = ["FileEnumeratorExtManual"]
     name = "iterate"
     # better with rust iterators
     ignore = true
+    [[object.function]]
+    name = "close"
+    # Return value does not indicate success or error: despite the documentation, this function could return TRUE and an error in same time.
+    # see https://gitlab.gnome.org/GNOME/glib/-/blob/dc6f9447cd2a01012731422afed6facff1eea81a/gio/gfileenumerator.c#L290-297
+    manual = true
 
 [[object]]
 name = "Gio.FileInfo"

gio/src/auto/file_enumerator.rs

@@ -20,24 +20,6 @@ impl FileEnumerator {
 }
 
 pub trait FileEnumeratorExt: IsA<FileEnumerator> + 'static {
-    #[doc(alias = "g_file_enumerator_close")]
-    fn close(&self, cancellable: Option<&impl IsA<Cancellable>>) -> Result<(), glib::Error> {
-        unsafe {
-            let mut error = std::ptr::null_mut();
-            let is_ok = ffi::g_file_enumerator_close(
-                self.as_ref().to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
-                &mut error,
-            );
-            debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
-            if error.is_null() {
-                Ok(())
-            } else {
-                Err(from_glib_full(error))
-            }
-        }
-    }
-
     #[doc(alias = "g_file_enumerator_close_async")]
     fn close_async<P: FnOnce(Result<(), glib::Error>) + 'static>(
         &self,

gio/src/file_enumerator.rs

@@ -3,6 +3,7 @@
 use crate::{prelude::*, FileEnumerator, FileInfo};
 use futures_core::future::LocalBoxFuture;
 use futures_util::FutureExt;
+use glib::translate::{from_glib, from_glib_full, ToGlibPtr};
 use std::{iter::FusedIterator, task::Poll};
 
 impl Iterator for FileEnumerator {
@@ -30,6 +31,22 @@ pub trait FileEnumeratorExtManual: IsA<FileEnumerator> {
             priority,
         }
     }
+
+    #[doc(alias = "g_file_enumerator_close")]
+    fn close(
+        &self,
+        cancellable: Option<&impl IsA<crate::Cancellable>>,
+    ) -> (bool, Option<glib::Error>) {
+        unsafe {
+            let mut error = std::ptr::null_mut();
+            let ret = crate::ffi::g_file_enumerator_close(
+                self.as_ref().to_glib_none().0,
+                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                &mut error,
+            );
+            (from_glib(ret), from_glib_full(error))
+        }
+    }
 }
 
 impl<O: IsA<FileEnumerator>> FileEnumeratorExtManual for O {}