From d770d498bff51ae0320fc0447cfcb1de53ea0a29 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 5 Nov 2020 11:01:23 +0000 Subject: ft2, xft: Write out the full type of the SubstituteFunc If the SubstituteFunc used for the now-deprecated set_default_substitute functions is an alias for PangoFcSubstituteFunc, GObject-Introspection doesn't realise it's a function pointer, and doesn't flag the user data and destroy-notify arguments as such. This results in bindings like PyGI thinking that they are entirely separate arguments, which is an introspection API break (and probably not something that can practically be called any more). Signed-off-by: Simon McVittie Resolves: https://gitlab.gnome.org/GNOME/pango/-/issues/510 --- pango/pangoft2.h | 3 ++- pango/pangoxft.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pango/pangoft2.h b/pango/pangoft2.h index 892aa039..96228316 100644 --- a/pango/pangoft2.h +++ b/pango/pangoft2.h @@ -67,7 +67,8 @@ typedef struct _PangoFT2FontMap PangoFT2FontMap; * * Function type for doing final config tweaking on prepared FcPatterns. */ -typedef PangoFcSubstituteFunc PangoFT2SubstituteFunc; +typedef void (*PangoFT2SubstituteFunc) (FcPattern *pattern, + gpointer data); /* Calls for applications */ diff --git a/pango/pangoxft.h b/pango/pangoxft.h index eb17f97c..0852c202 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -85,7 +85,8 @@ typedef struct _PangoXftFont PangoXftFont; * * Function type for doing final config tweaking on prepared FcPatterns. */ -typedef PangoFcSubstituteFunc PangoXftSubstituteFunc; +typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern, + gpointer data); /* Calls for applications */ -- cgit v1.2.1