From 346cd11c032067353e054c29e4716c722765d9aa Mon Sep 17 00:00:00 2001 From: Evgenii Pashkin Date: Sat, 7 Sep 2019 19:12:41 +0300 Subject: [PATCH] Use IsA for property setters --- gir | 2 +- gir-files | 2 +- src/auto/application.rs | 11 +++++++++-- src/auto/inet_address_mask.rs | 5 +++-- src/auto/versions.txt | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gir b/gir index 567f2b38..a6154685 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 567f2b38e6530daad21e003918d711a669eb5d9c +Subproject commit a6154685b372127458f25ed73c08b70afb625dd1 diff --git a/gir-files b/gir-files index cae49a8c..f7e3c517 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit cae49a8c0abede80c3f8321b27147bfa3d4801e9 +Subproject commit f7e3c5172236b466a44aae78adee05006793eb9e diff --git a/src/auto/application.rs b/src/auto/application.rs index 8d2c0293..e2cef50f 100644 --- a/src/auto/application.rs +++ b/src/auto/application.rs @@ -9,6 +9,7 @@ use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; +use glib::value::SetValueOptional; use glib::GString; use glib::StaticType; use glib::ToValue; @@ -209,7 +210,10 @@ pub trait ApplicationExt: 'static { fn withdraw_notification(&self, id: &str); - fn set_property_action_group(&self, action_group: Option<&ActionGroup>); + fn set_property_action_group + SetValueOptional>( + &self, + action_group: Option<&P>, + ); fn connect_activate(&self, f: F) -> SignalHandlerId; @@ -528,7 +532,10 @@ impl> ApplicationExt for O { } } - fn set_property_action_group(&self, action_group: Option<&ActionGroup>) { + fn set_property_action_group + SetValueOptional>( + &self, + action_group: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, diff --git a/src/auto/inet_address_mask.rs b/src/auto/inet_address_mask.rs index 9ca1e2aa..4d401e37 100644 --- a/src/auto/inet_address_mask.rs +++ b/src/auto/inet_address_mask.rs @@ -8,6 +8,7 @@ use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; +use glib::value::SetValueOptional; use glib::GString; use glib::Value; use glib_sys; @@ -79,7 +80,7 @@ pub trait InetAddressMaskExt: 'static { fn to_string(&self) -> GString; - fn set_property_address(&self, address: Option<&InetAddress>); + fn set_property_address + SetValueOptional>(&self, address: Option<&P>); fn set_property_length(&self, length: u32); @@ -146,7 +147,7 @@ impl> InetAddressMaskExt for O { } } - fn set_property_address(&self, address: Option<&InetAddress>) { + fn set_property_address + SetValueOptional>(&self, address: Option<&P>) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, diff --git a/src/auto/versions.txt b/src/auto/versions.txt index 8bdc7122..f9ae78c2 100644 --- a/src/auto/versions.txt +++ b/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 567f2b3) -from gir-files (https://github.com/gtk-rs/gir-files @ cae49a8) +Generated by gir (https://github.com/gtk-rs/gir @ a615468) +from gir-files (https://github.com/gtk-rs/gir-files @ f7e3c51)