gtk: don't leak snapshots

gtk-rs · Feb 3, 2025 · eebfc5b · eebfc5b
1 parent 5664d6d
commit eebfc5b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/gtk4/Gir.toml b/gtk4/Gir.toml
@@ -2080,20 +2080,21 @@ name = "Gtk.Snapshot"
 status = "generate"
 final_type = false
 manual_traits = ["SnapshotExtManual"]
-    [[object.function]]
-    pattern = "free_to_(node|paintable)"
-    ignore = true # C convenience functions
     [[object.function]]
     name = "append_border"
     manual = true
     [[object.function]]
     name = "push_debug"
     manual = true # ignore format args
     [[object.function]]
+    pattern = "free_to_node"
+    rename = "to_node"
+    [[object.function]]
+    pattern = "free_to_paintable"
+    rename = "to_paintable"
+    [[object.function]]
     pattern = "to_(node|paintable)"
-        [[object.function.parameter]]
-        name = "snapshot"
-        move = true
+    ignore = true
 
 [[object]]
 name = "Gtk.SortListModel"

diff --git a/gtk4/src/auto/snapshot.rs b/gtk4/src/auto/snapshot.rs
@@ -295,6 +295,27 @@ pub trait SnapshotExt: IsA<Snapshot> + 'static {
         }
     }
 
+    #[doc(alias = "gtk_snapshot_free_to_node")]
+    #[doc(alias = "free_to_node")]
+    fn to_node(self) -> Option<gsk::RenderNode> {
+        unsafe {
+            from_glib_full(ffi::gtk_snapshot_free_to_node(
+                self.upcast().into_glib_ptr(),
+            ))
+        }
+    }
+
+    #[doc(alias = "gtk_snapshot_free_to_paintable")]
+    #[doc(alias = "free_to_paintable")]
+    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable> {
+        unsafe {
+            from_glib_full(ffi::gtk_snapshot_free_to_paintable(
+                self.upcast().into_glib_ptr(),
+                size.to_glib_none().0,
+            ))
+        }
+    }
+
     #[cfg_attr(feature = "v4_16", deprecated = "Since 4.16")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_snapshot_gl_shader_pop_texture")]
@@ -617,21 +638,6 @@ pub trait SnapshotExt: IsA<Snapshot> + 'static {
         }
     }
 
-    #[doc(alias = "gtk_snapshot_to_node")]
-    fn to_node(self) -> Option<gsk::RenderNode> {
-        unsafe { from_glib_full(ffi::gtk_snapshot_to_node(self.upcast().into_glib_ptr())) }
-    }
-
-    #[doc(alias = "gtk_snapshot_to_paintable")]
-    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable> {
-        unsafe {
-            from_glib_full(ffi::gtk_snapshot_to_paintable(
-                self.upcast().into_glib_ptr(),
-                size.to_glib_none().0,
-            ))
-        }
-    }
-
     #[doc(alias = "gtk_snapshot_transform")]
     fn transform(&self, transform: Option<&gsk::Transform>) {
         unsafe {