diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2020-11-19 18:55:57 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2020-11-19 19:25:53 +0300 |
commit | d56ae71e0e4f5465fa32772414ca616ec7bcf0a6 (patch) | |
tree | 51811e16173d6a14a33813f8d77caabc1b207a91 /generic/threadshare/src/inputselector | |
parent | df6a229f58cd83591ed1702bd95199436644d22e (diff) |
Update for ObjectImpl::get_property() being infallible now
Diffstat (limited to 'generic/threadshare/src/inputselector')
-rw-r--r-- | generic/threadshare/src/inputselector/imp.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs index 914e4f39f..b7c6c8c33 100644 --- a/generic/threadshare/src/inputselector/imp.rs +++ b/generic/threadshare/src/inputselector/imp.rs @@ -527,22 +527,22 @@ impl ObjectImpl for InputSelector { } } - fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> { + fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value { let prop = &PROPERTIES[id]; match *prop { subclass::Property("context", ..) => { let settings = self.settings.lock().unwrap(); - Ok(settings.context.to_value()) + settings.context.to_value() } subclass::Property("context-wait", ..) => { let settings = self.settings.lock().unwrap(); - Ok(settings.context_wait.to_value()) + settings.context_wait.to_value() } subclass::Property("active-pad", ..) => { let state = self.state.lock().unwrap(); let active_pad = state.active_sinkpad.clone(); - Ok(active_pad.to_value()) + active_pad.to_value() } _ => unimplemented!(), } |