Merge pull request #926 from pbor/key_file

Use `PtrSlice<GStrPtr>` for `KeyFile` methods

Author: sdroege

glib/Gir.toml

@@ -612,6 +612,14 @@ status = "generate"
     #wrong array type
     ignore = true
     [[object.function]]
+    name = "get_groups"
+    #return slice of str pointers
+    manual = true
+    [[object.function]]
+    name = "get_keys"
+    #return slice of str pointers
+    manual = true
+    [[object.function]]
     name = "get_boolean"
     #boolean return value needs to be returned
     manual = true

glib/src/auto/key_file.rs

@@ -88,19 +88,6 @@ impl KeyFile {
         }
     }
 
-    #[doc(alias = "g_key_file_get_groups")]
-    #[doc(alias = "get_groups")]
-    pub fn groups(&self) -> (Vec<crate::GString>, usize) {
-        unsafe {
-            let mut length = mem::MaybeUninit::uninit();
-            let ret = FromGlibPtrContainer::from_glib_full(ffi::g_key_file_get_groups(
-                self.to_glib_none().0,
-                length.as_mut_ptr(),
-            ));
-            (ret, length.assume_init())
-        }
-    }
-
     #[doc(alias = "g_key_file_get_int64")]
     #[doc(alias = "get_int64")]
     pub fn int64(&self, group_name: &str, key: &str) -> Result<i64, crate::Error> {
@@ -163,29 +150,6 @@ impl KeyFile {
         }
     }
 
-    #[doc(alias = "g_key_file_get_keys")]
-    #[doc(alias = "get_keys")]
-    pub fn keys(&self, group_name: &str) -> Result<(Vec<crate::GString>, usize), crate::Error> {
-        unsafe {
-            let mut length = mem::MaybeUninit::uninit();
-            let mut error = ptr::null_mut();
-            let ret = ffi::g_key_file_get_keys(
-                self.to_glib_none().0,
-                group_name.to_glib_none().0,
-                length.as_mut_ptr(),
-                &mut error,
-            );
-            if error.is_null() {
-                Ok((
-                    FromGlibPtrContainer::from_glib_full(ret),
-                    length.assume_init(),
-                ))
-            } else {
-                Err(from_glib_full(error))
-            }
-        }
-    }
-
     #[doc(alias = "g_key_file_get_locale_for_key")]
     #[doc(alias = "get_locale_for_key")]
     pub fn locale_for_key(

glib/src/key_file.rs

@@ -2,7 +2,7 @@
 
 use std::{mem, path, ptr};
 
-use crate::{translate::*, Error, GString, KeyFile, KeyFileFlags};
+use crate::{translate::*, Error, GStrPtr, GString, KeyFile, KeyFileFlags, PtrSlice};
 
 impl KeyFile {
     #[doc(alias = "g_key_file_save_to_file")]
@@ -85,6 +85,39 @@ impl KeyFile {
         }
     }
 
+    #[doc(alias = "g_key_file_get_groups")]
+    #[doc(alias = "get_groups")]
+    pub fn groups(&self) -> PtrSlice<GStrPtr> {
+        unsafe {
+            let mut length = mem::MaybeUninit::uninit();
+            let ret = ffi::g_key_file_get_groups(self.to_glib_none().0, length.as_mut_ptr());
+            FromGlibContainer::from_glib_full_num(ret, length.assume_init() as _)
+        }
+    }
+
+    #[doc(alias = "g_key_file_get_keys")]
+    #[doc(alias = "get_keys")]
+    pub fn keys(&self, group_name: &str) -> Result<PtrSlice<GStrPtr>, crate::Error> {
+        unsafe {
+            let mut length = mem::MaybeUninit::uninit();
+            let mut error = ptr::null_mut();
+            let ret = ffi::g_key_file_get_keys(
+                self.to_glib_none().0,
+                group_name.to_glib_none().0,
+                length.as_mut_ptr(),
+                &mut error,
+            );
+            if error.is_null() {
+                Ok(FromGlibContainer::from_glib_full_num(
+                    ret,
+                    length.assume_init() as _,
+                ))
+            } else {
+                Err(from_glib_full(error))
+            }
+        }
+    }
+
     #[doc(alias = "g_key_file_get_boolean")]
     #[doc(alias = "get_boolean")]
     pub fn boolean(&self, group_name: &str, key: &str) -> Result<bool, Error> {
@@ -167,7 +200,7 @@ impl KeyFile {
 
     #[doc(alias = "g_key_file_get_string_list")]
     #[doc(alias = "get_string_list")]
-    pub fn string_list(&self, group_name: &str, key: &str) -> Result<Vec<GString>, Error> {
+    pub fn string_list(&self, group_name: &str, key: &str) -> Result<PtrSlice<GStrPtr>, Error> {
         unsafe {
             let mut length = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
@@ -223,7 +256,7 @@ impl KeyFile {
         group_name: &str,
         key: &str,
         locale: Option<&str>,
-    ) -> Result<Vec<GString>, Error> {
+    ) -> Result<PtrSlice<GStrPtr>, Error> {
         unsafe {
             let mut length = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();