Merge pull request #612 from gtk-rs/bilelmoussaoui/gtk-file-chooser

gtk: manually implement FileChooser::add_choice

gtk4/Gir.toml

@@ -1135,9 +1135,10 @@ final_type = true
 name = "Gtk.FileChooser"
 status = "generate"
 trust_return_value_nullability = false
+manual_traits = ["FileChooserExtManual"]
     [[object.function]]
     name = "add_choice"
-    ignore = true # TODO: strange type of options and option_labels
+    manual = true # rust-ify the options param
 
 [[object]]
 name = "Gtk.FileChooserDialog"

gtk4/src/file_chooser.rs

@@ -0,0 +1,45 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+use crate::FileChooser;
+use glib::translate::*;
+use glib::IsA;
+
+pub trait FileChooserExtManual: 'static {
+    #[doc(alias = "gtk_file_chooser_add_choice")]
+    fn add_choice(&self, id: &str, label: &str, options: &[(&str, &str)]);
+}
+
+impl<O: IsA<FileChooser>> FileChooserExtManual for O {
+    fn add_choice(&self, id: &str, label: &str, options: &[(&str, &str)]) {
+        unsafe {
+            let stashes_ids = options
+                .iter()
+                .map(|o| o.0.to_glib_none())
+                .collect::<Vec<_>>();
+            let stashes_labels = options
+                .iter()
+                .map(|o| o.1.to_glib_none())
+                .collect::<Vec<_>>();
+            let (options_ids, options_labels) = (
+                stashes_ids
+                    .iter()
+                    .map(|o| o.0)
+                    .collect::<Vec<*const libc::c_char>>()
+                    .as_ptr(),
+                stashes_labels
+                    .iter()
+                    .map(|o| o.0)
+                    .collect::<Vec<*const libc::c_char>>()
+                    .as_ptr(),
+            );
+
+            ffi::gtk_file_chooser_add_choice(
+                self.as_ref().to_glib_none().0,
+                id.to_glib_none().0,
+                label.to_glib_none().0,
+                mut_override(options_ids),
+                mut_override(options_labels),
+            );
+        }
+    }
+}

gtk4/src/lib.rs

@@ -131,6 +131,7 @@ mod entry_completion;
 mod enums;
 mod event_controller_key;
 mod expression_watch;
+mod file_chooser;
 mod file_chooser_dialog;
 mod flow_box;
 mod font_chooser;

gtk4/src/prelude.rs

@@ -18,6 +18,7 @@ pub use crate::drawing_area::DrawingAreaExtManual;
 pub use crate::editable::EditableExtManual;
 pub use crate::entry::EntryExtManual;
 pub use crate::entry_buffer::EntryBufferExtManual;
+pub use crate::file_chooser::FileChooserExtManual;
 pub use crate::font_chooser::FontChooserExtManual;
 pub use crate::im_context::IMContextExtManual;
 pub use crate::media_stream::MediaStreamExtManual;