Merge branch 'master' into value_delegate

Author: ranfdev

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 ## [Unreleased]
 
+## [0.17.2]
+
+Andrey Kutejko:
+- glib: Implement `PartialEq` and `PartialOrd` for `WeakRef`
+
+Bilal Elmoussaoui:
+- glib: Add missing `ObjectImpl` vfuncs overrides
+- glib: Mention lack of finalize method on `ObjectImpl`
+
+Jason Francis:
+- glib-macros: allow properties macro generated functions to be unused
+- glib: implement `WatchedObject` for `BorrowedObject`
+
+Mathieu Duponchelle:
+- glib: object: address misleading casting docs
+
+Matteo Biggio:
+- gio: `SimpleAction`: take ownership of value without leaking it
+
+Paolo Borelli:
+- glib: properties: impl `HasParamSpec` for `Vec<String>` and `StrV`
+- glib-macros: Derive `HasParamSpec` for `SharedBoxed`
+- glib: Add `StrV::join()` method
+- glib: Add `StrV::contains()` method
+
+SeaDve:
+- glib-macros: slightly improve `Properties` macro docs
+
+Sebastian Dröge:
+ - Update gir-files
+ - Regenerate with latest gir-files
+ - glib: Ignore new 2.76 free functions
+ - gio: Don't pass `NULL` to `g_list_store_find_with_equal_func_full()`
+
 ## [0.17.1]
 
 Guillaume Desmottes:

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
+from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
+from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40)

gio/Gir.toml

@@ -1157,21 +1157,6 @@ status = "generate"
     name = "state"
     #value glib::VariantTy
     ignore = true
-    [[object.function]]
-    name = "new_stateful"
-        [[object.function.parameter]]
-        name = "state"
-        move = true
-    [[object.function]]
-    name = "set_state"
-        [[object.function.parameter]]
-        name = "value"
-        move = true
-    [[object.function]]
-    name = "set_state_hint"
-        [[object.function.parameter]]
-        name = "state_hint"
-        move = true
 
 [[object]]
 name = "Gio.SimpleIOStream"

gio/src/action_map.rs

@@ -15,7 +15,7 @@ impl<O: IsA<ActionMap>> ActionMapExtManual for O {
     fn add_action_entries(&self, entries: impl IntoIterator<Item = ActionEntry<Self>>) {
         for entry in entries.into_iter() {
             let action = if let Some(state) = entry.state() {
-                SimpleAction::new_stateful(entry.name(), entry.parameter_type(), state.clone())
+                SimpleAction::new_stateful(entry.name(), entry.parameter_type(), state)
             } else {
                 SimpleAction::new(entry.name(), entry.parameter_type())
             };

gio/src/auto/simple_action.rs

@@ -34,13 +34,13 @@ impl SimpleAction {
     pub fn new_stateful(
         name: &str,
         parameter_type: Option<&glib::VariantTy>,
-        state: glib::Variant,
+        state: &glib::Variant,
     ) -> SimpleAction {
         unsafe {
             from_glib_full(ffi::g_simple_action_new_stateful(
                 name.to_glib_none().0,
                 parameter_type.to_glib_none().0,
-                state.into_glib_ptr(),
+                state.to_glib_none().0,
             ))
         }
     }
@@ -53,16 +53,16 @@ impl SimpleAction {
     }
 
     #[doc(alias = "g_simple_action_set_state")]
-    pub fn set_state(&self, value: glib::Variant) {
+    pub fn set_state(&self, value: &glib::Variant) {
         unsafe {
-            ffi::g_simple_action_set_state(self.to_glib_none().0, value.into_glib_ptr());
+            ffi::g_simple_action_set_state(self.to_glib_none().0, value.to_glib_none().0);
         }
     }
 
     #[doc(alias = "g_simple_action_set_state_hint")]
-    pub fn set_state_hint(&self, state_hint: Option<glib::Variant>) {
+    pub fn set_state_hint(&self, state_hint: Option<&glib::Variant>) {
         unsafe {
-            ffi::g_simple_action_set_state_hint(self.to_glib_none().0, state_hint.into_glib_ptr());
+            ffi::g_simple_action_set_state_hint(self.to_glib_none().0, state_hint.to_glib_none().0);
         }
     }
 

gio/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
+from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40)

gio/src/list_store.rs

@@ -87,6 +87,16 @@ impl ListStore {
         }
 
         unsafe {
+            // GIO requires a non-NULL item to be passed in so we're constructing a fake item here.
+            // See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3284
+            let item = glib::gobject_ffi::GObject {
+                g_type_instance: glib::gobject_ffi::GTypeInstance {
+                    g_class: glib::gobject_ffi::g_type_class_peek(self.item_type().into_glib())
+                        as *mut _,
+                },
+                ref_count: 1,
+                qdata: std::ptr::null_mut(),
+            };
             let mut func = equal_func;
             let func_obj: &mut (dyn FnMut(&Object) -> bool) = &mut func;
             let func_ptr =
@@ -96,7 +106,7 @@ impl ListStore {
 
             let found = bool::from_glib(ffi::g_list_store_find_with_equal_func_full(
                 self.to_glib_none().0,
-                std::ptr::null_mut(),
+                mut_override(&item as *const _),
                 Some(equal_func_trampoline),
                 func_ptr,
                 position.as_mut_ptr(),
@@ -190,4 +200,17 @@ mod tests {
         assert_eq!(list.item(1).as_ref(), Some(item1.upcast_ref()));
         assert_eq!(list.item(2).as_ref(), None);
     }
+
+    #[cfg(feature = "v2_74")]
+    #[test]
+    fn find() {
+        let item0 = ListStore::new(ListStore::static_type());
+        let item1 = ListStore::new(ListStore::static_type());
+        let list = ListStore::new(ListStore::static_type());
+        list.append(&item0);
+        list.append(&item1);
+
+        let res = list.find_with_equal_func(|item| item == &item1);
+        assert_eq!(res, Some(1));
+    }
 }

gio/sys/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
-from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)
+from gir-files (https://github.com/gtk-rs/gir-files @ 318e14efee40)