gio: Use correct types for UNIX-specific Credentials API

And also bind native setter/getter.

See https://gitlab.gnome.org/GNOME/glib/-/issues/3311 for why this is
necessary.

Author: sdroege

gio/Gir.toml

@@ -438,14 +438,27 @@ status = "generate"
     [[object.function]]
     name = "get_unix_pid"
     cfg_condition = "unix"
+    # Use correct libc type
+    # https://gitlab.gnome.org/GNOME/glib/-/issues/3311
+    manual = true
     [[object.function]]
     name = "get_unix_user"
     cfg_condition = "unix"
+    # Use correct libc type
+    # https://gitlab.gnome.org/GNOME/glib/-/issues/3311
+    manual = true
         [object.function.return]
         use_return_for_result = true
     [[object.function]]
     name = "set_unix_user"
     cfg_condition = "unix"
+    # Use correct libc type
+    # https://gitlab.gnome.org/GNOME/glib/-/issues/3311
+    manual = true
+    [[object.function]]
+    pattern = "[gs]et_native"
+    # Unsafe and using raw pointers
+    manual = true
 
 [[object]]
 name = "Gio.CredentialsType"

gio/src/auto/credentials.rs

@@ -19,44 +19,6 @@ impl Credentials {
         unsafe { from_glib_full(ffi::g_credentials_new()) }
     }
 
-    //#[doc(alias = "g_credentials_get_native")]
-    //#[doc(alias = "get_native")]
-    //pub fn native(&self, native_type: CredentialsType) -> /*Unimplemented*/Option<Basic: Pointer> {
-    //    unsafe { TODO: call ffi:g_credentials_get_native() }
-    //}
-
-    #[cfg(unix)]
-    #[cfg_attr(docsrs, doc(cfg(unix)))]
-    #[doc(alias = "g_credentials_get_unix_pid")]
-    #[doc(alias = "get_unix_pid")]
-    pub fn unix_pid(&self) -> Result<i32, glib::Error> {
-        unsafe {
-            let mut error = std::ptr::null_mut();
-            let ret = ffi::g_credentials_get_unix_pid(self.to_glib_none().0, &mut error);
-            if error.is_null() {
-                Ok(ret)
-            } else {
-                Err(from_glib_full(error))
-            }
-        }
-    }
-
-    #[cfg(unix)]
-    #[cfg_attr(docsrs, doc(cfg(unix)))]
-    #[doc(alias = "g_credentials_get_unix_user")]
-    #[doc(alias = "get_unix_user")]
-    pub fn unix_user(&self) -> Result<u32, glib::Error> {
-        unsafe {
-            let mut error = std::ptr::null_mut();
-            let ret = ffi::g_credentials_get_unix_user(self.to_glib_none().0, &mut error);
-            if error.is_null() {
-                Ok(ret)
-            } else {
-                Err(from_glib_full(error))
-            }
-        }
-    }
-
     #[doc(alias = "g_credentials_is_same_user")]
     pub fn is_same_user(&self, other_credentials: &Credentials) -> Result<(), glib::Error> {
         unsafe {
@@ -75,27 +37,6 @@ impl Credentials {
         }
     }
 
-    //#[doc(alias = "g_credentials_set_native")]
-    //pub fn set_native(&self, native_type: CredentialsType, native: /*Unimplemented*/Basic: Pointer) {
-    //    unsafe { TODO: call ffi:g_credentials_set_native() }
-    //}
-
-    #[cfg(unix)]
-    #[cfg_attr(docsrs, doc(cfg(unix)))]
-    #[doc(alias = "g_credentials_set_unix_user")]
-    pub fn set_unix_user(&self, uid: u32) -> Result<(), glib::Error> {
-        unsafe {
-            let mut error = std::ptr::null_mut();
-            let is_ok = ffi::g_credentials_set_unix_user(self.to_glib_none().0, uid, &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_credentials_to_string")]
     #[doc(alias = "to_string")]
     pub fn to_str(&self) -> glib::GString {

gio/src/credentials.rs

@@ -0,0 +1,68 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+use glib::translate::*;
+
+use crate::{Credentials, CredentialsType};
+
+impl Credentials {
+    #[doc(alias = "g_credentials_get_native")]
+    #[doc(alias = "get_native")]
+    pub fn native(&self, native_type: CredentialsType) -> glib::ffi::gpointer {
+        unsafe { ffi::g_credentials_get_native(self.to_glib_none().0, native_type.into_glib()) }
+    }
+
+    #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
+    #[doc(alias = "g_credentials_get_unix_pid")]
+    #[doc(alias = "get_unix_pid")]
+    pub fn unix_pid(&self) -> Result<libc::pid_t, glib::Error> {
+        unsafe {
+            let mut error = std::ptr::null_mut();
+            let ret = ffi::g_credentials_get_unix_pid(self.to_glib_none().0, &mut error);
+            if error.is_null() {
+                Ok(ret)
+            } else {
+                Err(from_glib_full(error))
+            }
+        }
+    }
+
+    #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
+    #[doc(alias = "g_credentials_get_unix_user")]
+    #[doc(alias = "get_unix_user")]
+    pub fn unix_user(&self) -> Result<libc::uid_t, glib::Error> {
+        unsafe {
+            let mut error = std::ptr::null_mut();
+            let ret = ffi::g_credentials_get_unix_user(self.to_glib_none().0, &mut error);
+            if error.is_null() {
+                Ok(ret)
+            } else {
+                Err(from_glib_full(error))
+            }
+        }
+    }
+
+    #[doc(alias = "g_credentials_set_native")]
+    pub unsafe fn set_native(&self, native_type: CredentialsType, native: glib::ffi::gpointer) {
+        unsafe {
+            ffi::g_credentials_set_native(self.to_glib_none().0, native_type.into_glib(), native)
+        }
+    }
+
+    #[cfg(unix)]
+    #[cfg_attr(docsrs, doc(cfg(unix)))]
+    #[doc(alias = "g_credentials_set_unix_user")]
+    pub fn set_unix_user(&self, uid: libc::uid_t) -> Result<(), glib::Error> {
+        unsafe {
+            let mut error = std::ptr::null_mut();
+            let is_ok = ffi::g_credentials_set_unix_user(self.to_glib_none().0, uid, &mut error);
+            debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
+            if error.is_null() {
+                Ok(())
+            } else {
+                Err(from_glib_full(error))
+            }
+        }
+    }
+}

gio/src/lib.rs

@@ -21,6 +21,7 @@ mod cancellable;
 mod cancellable_future;
 pub use crate::cancellable_future::{CancellableFuture, Cancelled};
 mod converter;
+mod credentials;
 mod data_input_stream;
 mod datagram_based;
 mod dbus;