diff options
| author | Mart Raudsepp <leio@gentoo.org> | 2022-11-30 09:25:22 +0200 |
|---|---|---|
| committer | PulseAudio Marge Bot <pulseaudio-maintainers@lists.freedesktop.org> | 2022-12-10 09:01:58 +0000 |
| commit | 89ce6321bd19452097392ddfb416bc51a280b63e (patch) | |
| tree | b92a4ef97bf074a6f8ada518bddba7f55cfad4bb | |
| parent | 47a6918739cb06dafa970d0b528bed1951d95039 (diff) | |
| download | pulseaudio-89ce6321bd19452097392ddfb416bc51a280b63e.tar.gz | |
proplist-util: Don't assume gdkx is there as gtk could be built without it
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/757>
| -rw-r--r-- | src/pulsecore/proplist-util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c index 16ea9e006..1330ef5ef 100644 --- a/src/pulsecore/proplist-util.c +++ b/src/pulsecore/proplist-util.c @@ -51,10 +51,12 @@ static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_applicati #if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF) #pragma GCC diagnostic ignored "-Wstrict-prototypes" #include <gtk/gtk.h> -#include <gdk/gdkx.h> static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name); +#ifdef GDK_WINDOWING_X11 +#include <gdk/gdkx.h> static Display *_gdk_display PA_GCC_WEAKREF(gdk_display); #endif +#endif #include "proplist-util.h" @@ -89,6 +91,7 @@ static void add_gtk_properties(pa_proplist *p) { pa_proplist_sets(p, PA_PROP_APPLICATION_ICON_NAME, t); } +#ifdef GDK_WINDOWING_X11 if (!pa_proplist_contains(p, PA_PROP_WINDOW_X11_DISPLAY)) if (&_gdk_display && _gdk_display) { const char *t; @@ -100,6 +103,7 @@ static void add_gtk_properties(pa_proplist *p) { } #endif +#endif } void pa_init_proplist(pa_proplist *p) { |