From: Thomas B. Clark <git@ferree-clark.org>
Date: Mon, 12 May 2025 21:46:00 +0000 (-0400)
Subject: menuselect: Fix GTK menu callbacks for Fedora 42 compatibility
X-Git-Tag: 21.10.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a5981307b9bff858761de5fb077183c62b9c695;p=thirdparty%2Fasterisk.git

menuselect: Fix GTK menu callbacks for Fedora 42 compatibility

This patch resolves a build failure in `menuselect_gtk.c` when running
`make menuconfig` on Fedora 42. The new version of GTK introduced stricter
type checking for callback signatures.

Changes include:
- Add wrapper functions to match the expected `void (*)(void)` signature.
- Update `menu_items` array to use these wrappers.

Fixes: #1243
(cherry picked from commit 28f5d4a2ecc1c98239367cd43f5b022bef403b58)
---

diff --git a/menuselect/menuselect_gtk.c b/menuselect/menuselect_gtk.c
index 2e8b5b1f5b..ced8bc4c4d 100644
--- a/menuselect/menuselect_gtk.c
+++ b/menuselect/menuselect_gtk.c
@@ -48,9 +48,9 @@ enum {
 	NUM_COLUMNS,
 };
 
-static void handle_save(GtkWidget *w, gpointer data);
-static void handle_about(GtkWidget *w, gpointer data);
-static void handle_quit(GtkWidget *w, gpointer data);
+static void handle_save(void);
+static void handle_about(void);
+static void handle_quit(void);
 
 static GtkItemFactoryEntry menu_items[] = {
   { "/_File",               NULL,         NULL,           0, "<Branch>" },
@@ -70,13 +70,13 @@ static GtkWidget *window;
 static int main_res = 1;
 static int change_made = 0;
 
-static void handle_save(GtkWidget *w, gpointer data)
+static void handle_save()
 {
 	main_res = 0;
 	gtk_main_quit();
 }
 
-static void handle_about(GtkWidget *w, gpointer data)
+static void handle_about()
 {
 	GtkWidget *dialog;
 
@@ -95,7 +95,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 	return FALSE;
 }
 
-static void handle_quit(GtkWidget *widget, gpointer data)
+static void handle_quit()
 {
 	gtk_main_quit();
 }