From f2f7b6ffec7bf657966353c850d25c6ab218ff7c Mon Sep 17 00:00:00 2001 From: Vika Date: Tue, 22 Oct 2024 21:52:10 +0300 Subject: vendor libsecret The libsecret-rs crate is unmaintained, so I'm vendoring it for now. Bumping the glib version turned out to be enough. The exact process I used was: 1. Cloning the repository 2. Making changes 3. `cargo build` to ensure it works 4. `cargo package --no-verify` (b/c it tries to build all crates separately instead of the entire workspace as a whole) 5. `mkdir libsecret/sys -p` 6. `tar --strip-components 1 -C libsecret -xvf ../libsecret-rs/target/package/libsecret-0.6.0.crate` 7. `tar --strip-components 1 -C libsecret/sys -xvf ../libsecret-rs/target/package/libsecret-sys-0.6.0.crate` Then `Cargo.toml` is modified to ensure the libsecret and its `-sys` crate build out of my vendored sources. In the future, if I gain maintainership of the `libsecret` crate, I could just revert this commit to make it point back to the upstream. --- libsecret/src/prompt.rs | 100 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 libsecret/src/prompt.rs (limited to 'libsecret/src/prompt.rs') diff --git a/libsecret/src/prompt.rs b/libsecret/src/prompt.rs new file mode 100644 index 0000000..bfb7845 --- /dev/null +++ b/libsecret/src/prompt.rs @@ -0,0 +1,100 @@ +// Take a look at the license at the top of the repository in the LICENSE file. + +use crate::Prompt; + +use glib::object::IsA; +use glib::translate::*; + +use std::boxed::Box as Box_; +use std::pin::Pin; +use std::ptr; + +pub trait PromptExtManual: 'static { + #[doc(alias = "secret_prompt_perform")] + fn perform) + 'static>( + &self, + window_id: Option<&str>, + return_type: &glib::VariantTy, + cancellable: Option<&impl IsA>, + callback: P, + ); + + fn perform_future( + &self, + window_id: Option<&str>, + return_type: &glib::VariantTy, + ) -> Pin> + 'static>>; +} + +impl> PromptExtManual for O { + fn perform) + 'static>( + &self, + window_id: Option<&str>, + return_type: &glib::VariantTy, + cancellable: Option<&impl IsA>, + callback: P, + ) { + let main_context = glib::MainContext::ref_thread_default(); + let is_main_context_owner = main_context.is_owner(); + let has_acquired_main_context = (!is_main_context_owner) + .then(|| main_context.acquire().ok()) + .flatten(); + assert!( + is_main_context_owner || has_acquired_main_context.is_some(), + "Async operations only allowed if the thread is owning the MainContext" + ); + + let user_data: Box_> = + Box_::new(glib::thread_guard::ThreadGuard::new(callback)); + unsafe extern "C" fn perform_trampoline< + P: FnOnce(Result) + 'static, + >( + _source_object: *mut glib::gobject_ffi::GObject, + res: *mut gio::ffi::GAsyncResult, + user_data: glib::ffi::gpointer, + ) { + let mut error = ptr::null_mut(); + let ret = ffi::secret_prompt_perform_finish(_source_object as *mut _, res, &mut error); + let result = if error.is_null() { + Ok(from_glib_full(ret)) + } else { + Err(from_glib_full(error)) + }; + let callback: Box_> = + Box_::from_raw(user_data as *mut _); + let callback: P = callback.into_inner(); + callback(result); + } + let callback = perform_trampoline::

; + unsafe { + ffi::secret_prompt_perform( + self.as_ref().to_glib_none().0, + window_id.to_glib_none().0, + return_type.to_glib_none().0, + cancellable.map(|p| p.as_ref()).to_glib_none().0, + Some(callback), + Box_::into_raw(user_data) as *mut _, + ); + } + } + + fn perform_future( + &self, + window_id: Option<&str>, + return_type: &glib::VariantTy, + ) -> Pin> + 'static>> + { + let window_id = window_id.map(ToOwned::to_owned); + let return_type = return_type.to_owned(); + Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| { + obj.perform( + window_id.as_ref().map(::std::borrow::Borrow::borrow), + &return_type, + Some(cancellable), + move |res| { + send.resolve(res); + }, + ); + })) + } +} -- cgit 1.4.1