From 0605fae2501c475e8ad3296948a90b6370bc57e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Sun, 10 May 2026 10:31:00 +0200
Subject: [PATCH] gtk.cfg: Fix gtk_widget_destroy definition and usage

gtk_widget_destroy is only for GtkWidget derived objects, and in
practice should only be used for GtkWindow derived widgets (it is
replaced with gtk_window_destroy in gtk4).
---
 cfg/gtk.cfg    | 28 +++++++++++++++++++++++-----
 test/cfg/gtk.c |  6 ++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg
index c4ab8972155..8aa1edc679a 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -909,7 +909,6 @@
     <alloc init="true" no-fail="true">g_zlib_decompressor_new</alloc>
     <use>g_object_ref</use>
     <dealloc>g_object_unref</dealloc>
-    <dealloc>gtk_widget_destroy</dealloc>
   </memory>
   <memory>
     <alloc init="true" no-fail="true">g_tree_new</alloc>
@@ -925,6 +924,11 @@
     <use>g_file_attribute_matcher_ref</use>
     <dealloc>g_file_attribute_matcher_unref</dealloc>
   </memory>
+  <memory>
+    <alloc init="true" no-fail="true">gtk_window_new</alloc>
+    <dealloc>gtk_widget_destroy</dealloc>
+    <dealloc>gtk_window_destroy</dealloc>
+  </memory>
   <function name="g_application_get_default">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -9693,6 +9697,14 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <function name="gtk_window_new">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="GtkWidget *"/>
+    <arg nr="1">
+      <not-bool/>
+    </arg>
+  </function>
   <function name="gtk_window_list_toplevels">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -21135,10 +21147,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="gtk_widget_destroy">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="gtk_widget_destroyed">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -21795,6 +21803,13 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <function name="gtk_window_destroy">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
   <function name="gtk_window_fullscreen">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -22972,6 +22987,9 @@
   <define name="GTK_IMAGE_ICON_NAME" value="1"/>
   <define name="GTK_IMAGE_GICON" value="2"/>
   <define name="GTK_IMAGE_PAINTABLE" value="3"/>
+  <!-- gtk/gtkwindow.h -->
+  <define name="GTK_WINDOW_TOPLEVEL" value="0"/>
+  <define name="GTK_WINDOW_POPUP" value="1"/>
   <!-- gtk/gtk.h -->
   <define name="GTK_STOCK_ZOOM_IN" value="&quot;gtk-zoom-in&quot;"/>
   <define name="GTK_STOCK_ZOOM_FIT" value="&quot;gtk-zoom-fit&quot;"/>
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index bcee84c8264..ec52255f2ea 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -585,3 +585,9 @@ void g_tree_test() {
     printf("%p\n", tree2);
     // cppcheck-suppress memleak
 }
+
+void gtk_widget_destroy_test() {
+    GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_widget_show(widget);
+    gtk_widget_destroy(widget);
+}