Merge pull request #898 from pbor/proxy-strv

gio: use StrV for the simple proxy resolver API

Author: sdroege

gio/Gir.toml

@@ -1380,6 +1380,10 @@ manual_traits = ["TlsConnectionExtManual"]
     name = "get_channel_binding_data"
     # Gir confuses the mutability of the data
     manual = true
+    [[object.function]]
+    name = "set_advertised_protocols"
+    # Use strv
+    manual = true
 
 [[object]]
 name = "Gio.TlsError"

gio/src/auto/tls_connection.rs

@@ -102,11 +102,6 @@ pub trait TlsConnectionExt: 'static {
         io_priority: glib::Priority,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>>;
 
-    #[cfg(any(feature = "v2_60", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))]
-    #[doc(alias = "g_tls_connection_set_advertised_protocols")]
-    fn set_advertised_protocols(&self, protocols: &[&str]);
-
     #[doc(alias = "g_tls_connection_set_certificate")]
     fn set_certificate(&self, certificate: &impl IsA<TlsCertificate>);
 
@@ -369,17 +364,6 @@ impl<O: IsA<TlsConnection>> TlsConnectionExt for O {
         ))
     }
 
-    #[cfg(any(feature = "v2_60", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))]
-    fn set_advertised_protocols(&self, protocols: &[&str]) {
-        unsafe {
-            ffi::g_tls_connection_set_advertised_protocols(
-                self.as_ref().to_glib_none().0,
-                protocols.to_glib_none().0,
-            );
-        }
-    }
-
     fn set_certificate(&self, certificate: &impl IsA<TlsCertificate>) {
         unsafe {
             ffi::g_tls_connection_set_certificate(

gio/src/simple_proxy_resolver.rs

@@ -1,34 +1,38 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use glib::{prelude::*, translate::*};
+use glib::{prelude::*, translate::*, IntoStrV};
 
 use crate::{ProxyResolver, SimpleProxyResolver};
 
 impl SimpleProxyResolver {
     #[doc(alias = "g_simple_proxy_resolver_new")]
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(default_proxy: Option<&str>, ignore_hosts: &[&str]) -> ProxyResolver {
+    pub fn new(default_proxy: Option<&str>, ignore_hosts: impl IntoStrV) -> ProxyResolver {
         unsafe {
-            from_glib_full(ffi::g_simple_proxy_resolver_new(
-                default_proxy.to_glib_none().0,
-                ignore_hosts.to_glib_none().0,
-            ))
+            ignore_hosts.run_with_strv(|ignore_hosts| {
+                from_glib_full(ffi::g_simple_proxy_resolver_new(
+                    default_proxy.to_glib_none().0,
+                    ignore_hosts.as_ptr() as *mut _,
+                ))
+            })
         }
     }
 }
 
 pub trait SimpleProxyResolverExtManual: 'static {
     #[doc(alias = "g_simple_proxy_resolver_set_ignore_hosts")]
-    fn set_ignore_hosts(&self, ignore_hosts: &[&str]);
+    fn set_ignore_hosts(&self, ignore_hosts: impl IntoStrV);
 }
 
 impl<O: IsA<SimpleProxyResolver>> SimpleProxyResolverExtManual for O {
-    fn set_ignore_hosts(&self, ignore_hosts: &[&str]) {
+    fn set_ignore_hosts(&self, ignore_hosts: impl IntoStrV) {
         unsafe {
-            ffi::g_simple_proxy_resolver_set_ignore_hosts(
-                self.as_ref().to_glib_none().0,
-                ignore_hosts.to_glib_none().0,
-            );
+            ignore_hosts.run_with_strv(|ignore_hosts| {
+                ffi::g_simple_proxy_resolver_set_ignore_hosts(
+                    self.as_ref().to_glib_none().0,
+                    ignore_hosts.as_ptr() as *mut _,
+                );
+            })
         }
     }
 }

gio/src/tls_connection.rs

@@ -5,7 +5,7 @@ use std::ptr;
 
 use glib::prelude::*;
 #[cfg(any(feature = "v2_66", feature = "dox"))]
-use glib::translate::*;
+use glib::{translate::*, IntoStrV};
 
 #[cfg(any(feature = "v2_66", feature = "dox"))]
 use crate::TlsChannelBindingType;
@@ -20,6 +20,11 @@ pub trait TlsConnectionExtManual {
         &self,
         type_: TlsChannelBindingType,
     ) -> Result<glib::ByteArray, glib::Error>;
+
+    #[cfg(any(feature = "v2_60", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))]
+    #[doc(alias = "g_tls_connection_set_advertised_protocols")]
+    fn set_advertised_protocols(&self, protocols: impl IntoStrV);
 }
 
 impl<O: IsA<TlsConnection>> TlsConnectionExtManual for O {
@@ -45,4 +50,17 @@ impl<O: IsA<TlsConnection>> TlsConnectionExtManual for O {
             }
         }
     }
+
+    #[cfg(any(feature = "v2_60", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_60")))]
+    fn set_advertised_protocols(&self, protocols: impl IntoStrV) {
+        unsafe {
+            protocols.run_with_strv(|protocols| {
+                ffi::g_tls_connection_set_advertised_protocols(
+                    self.as_ref().to_glib_none().0,
+                    protocols.as_ptr() as *mut _,
+                );
+            })
+        }
+    }
 }