mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-09 22:54:10 +02:00
e8b9fd5af3
Signed-off-by: Guillermo Joandet <gjoandet@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32915 Signed-off-by: Matt Turner <mattst88@gentoo.org>
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54
|
|
|
|
From 359a3c2ea1614195c647c2c57e940805986e7ab3 Mon Sep 17 00:00:00 2001
|
|
From: Matt Turner <mattst88@gmail.com>
|
|
Date: Sat, 8 Jul 2023 00:01:07 -0400
|
|
Subject: [PATCH] window: Fix function callback definition
|
|
|
|
Without this, the build fails with clang with
|
|
CFLAGS=-Werror=incompatible-function-pointer-types
|
|
|
|
```
|
|
../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types]
|
|
gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb);
|
|
^~~~~~~~~~~~~~~~~~~~~~~
|
|
/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here
|
|
GtkWidgetActionActivateFunc activate);
|
|
^
|
|
```
|
|
---
|
|
src/font-view-window.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/font-view-window.c b/src/font-view-window.c
|
|
index 639ac33..24461f7 100644
|
|
--- a/src/font-view-window.c
|
|
+++ b/src/font-view-window.c
|
|
@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self)
|
|
}
|
|
|
|
static void
|
|
-action_toggle_search_cb (FontViewWindow *self)
|
|
+action_toggle_search_cb (GtkWidget *widget,
|
|
+ const char *action_name,
|
|
+ GVariant *parameter)
|
|
{
|
|
+ FontViewWindow *self = FONT_VIEW_WINDOW (widget);
|
|
|
|
gtk_toggle_button_set_active (self->search_button,
|
|
!gtk_toggle_button_get_active (self->search_button));
|
|
--
|
|
2.41.0
|
|
|