PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits: 89ce6321 by Mart Raudsepp at 2022-12-10T09:01:58+00:00 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> - - - - - 1 changed file: - src/pulsecore/proplist-util.c Changes: ===================================== 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; @@ -99,6 +102,7 @@ static void add_gtk_properties(pa_proplist *p) { pa_proplist_sets(p, PA_PROP_WINDOW_X11_DISPLAY, t); } +#endif #endif } View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/89ce6321bd19452097392ddfb416bc51a280b63e -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/89ce6321bd19452097392ddfb416bc51a280b63e You're receiving this email because of your account on gitlab.freedesktop.org.
