Merge pull request #1764 from gtk-rs/auto-pr-branch

Automated PR: Changes from updating gir/gir-files

Author: sdroege

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4453f2993956)
+from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4453f2993956)
+from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)

gio/Gir.toml

@@ -950,6 +950,10 @@ concurrency = "send+sync"
     name = "new_from_bytes"
     # broken and needs some closer integration with the corresponding std types
     manual = true
+    [[object.function]]
+    name = "new_from_bytes_with_ipv6_info"
+    # broken and needs some closer integration with the corresponding std types
+    manual = true
 
     [[object.function]]
     name = "to_bytes"

gio/src/auto/inet_address.rs

@@ -70,6 +70,14 @@ pub trait InetAddressExt: IsA<InetAddress> + 'static {
         }
     }
 
+    #[cfg(feature = "v2_86")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
+    #[doc(alias = "g_inet_address_get_flowinfo")]
+    #[doc(alias = "get_flowinfo")]
+    fn flowinfo(&self) -> u32 {
+        unsafe { ffi::g_inet_address_get_flowinfo(self.as_ref().to_glib_none().0) }
+    }
+
     #[doc(alias = "g_inet_address_get_is_any")]
     #[doc(alias = "get_is_any")]
     #[doc(alias = "is-any")]
@@ -186,6 +194,15 @@ pub trait InetAddressExt: IsA<InetAddress> + 'static {
         unsafe { ffi::g_inet_address_get_native_size(self.as_ref().to_glib_none().0) }
     }
 
+    #[cfg(feature = "v2_86")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
+    #[doc(alias = "g_inet_address_get_scope_id")]
+    #[doc(alias = "get_scope_id")]
+    #[doc(alias = "scope-id")]
+    fn scope_id(&self) -> u32 {
+        unsafe { ffi::g_inet_address_get_scope_id(self.as_ref().to_glib_none().0) }
+    }
+
     #[doc(alias = "g_inet_address_to_string")]
     #[doc(alias = "to_string")]
     fn to_str(&self) -> glib::GString {

gio/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4453f2993956)
+from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)

gio/src/inet_address.rs

@@ -40,6 +40,31 @@ impl InetAddress {
             ))
         }
     }
+
+    #[cfg(feature = "v2_86")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
+    #[doc(alias = "g_inet_address_new_from_bytes_with_ipv6_info")]
+    #[doc(alias = "new_from_bytes_with_ipv6_info")]
+    pub fn from_bytes_with_ipv6_info(
+        inet_address_bytes: InetAddressBytes,
+        flowinfo: u32,
+        scope_id: u32,
+    ) -> InetAddress {
+        let bytes = inet_address_bytes.deref();
+
+        let family = match inet_address_bytes {
+            InetAddressBytes::V4(_) => SocketFamily::Ipv4,
+            InetAddressBytes::V6(_) => SocketFamily::Ipv6,
+        };
+        unsafe {
+            from_glib_full(ffi::g_inet_address_new_from_bytes_with_ipv6_info(
+                bytes.to_glib_none().0,
+                family.into_glib(),
+                flowinfo,
+                scope_id,
+            ))
+        }
+    }
 }
 
 pub trait InetAddressExtManual: IsA<InetAddress> + 'static {

gio/sys/src/lib.rs

@@ -12236,13 +12236,24 @@ extern "C" {
         bytes: *const u8,
         family: GSocketFamily,
     ) -> *mut GInetAddress;
+    #[cfg(feature = "v2_86")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
+    pub fn g_inet_address_new_from_bytes_with_ipv6_info(
+        bytes: *const u8,
+        family: GSocketFamily,
+        flowinfo: u32,
+        scope_id: u32,
+    ) -> *mut GInetAddress;
     pub fn g_inet_address_new_from_string(string: *const c_char) -> *mut GInetAddress;
     pub fn g_inet_address_new_loopback(family: GSocketFamily) -> *mut GInetAddress;
     pub fn g_inet_address_equal(
         address: *mut GInetAddress,
         other_address: *mut GInetAddress,
     ) -> gboolean;
     pub fn g_inet_address_get_family(address: *mut GInetAddress) -> GSocketFamily;
+    #[cfg(feature = "v2_86")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
+    pub fn g_inet_address_get_flowinfo(address: *mut GInetAddress) -> u32;
     pub fn g_inet_address_get_is_any(address: *mut GInetAddress) -> gboolean;
     pub fn g_inet_address_get_is_link_local(address: *mut GInetAddress) -> gboolean;
     pub fn g_inet_address_get_is_loopback(address: *mut GInetAddress) -> gboolean;
@@ -12254,6 +12265,9 @@ extern "C" {
     pub fn g_inet_address_get_is_multicast(address: *mut GInetAddress) -> gboolean;
     pub fn g_inet_address_get_is_site_local(address: *mut GInetAddress) -> gboolean;
     pub fn g_inet_address_get_native_size(address: *mut GInetAddress) -> size_t;
+    #[cfg(feature = "v2_86")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
+    pub fn g_inet_address_get_scope_id(address: *mut GInetAddress) -> u32;
     pub fn g_inet_address_to_bytes(address: *mut GInetAddress) -> *const u8;
     pub fn g_inet_address_to_string(address: *mut GInetAddress) -> *mut c_char;
 

gio/sys/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4453f2993956)
+from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)

gir-files

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ b3d444a058cf)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4453f2993956)
+from gir-files (https://github.com/gtk-rs/gir-files @ 5c1e490fe50a)