mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

proplist-util: Don't assume gdkx is there as gtk could be built without it

Browse source 
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/757>
This commit is contained in:
Mart Raudsepp 2022-11-30 09:25:22 +02:00 • committed by PulseAudio Marge Bot
parent 47a6918739
commit 89ce6321bd
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulsecore/proplist-util.c
View file

@ -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) #if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF)
#pragma GCC diagnostic ignored "-Wstrict-prototypes" #pragma GCC diagnostic ignored "-Wstrict-prototypes"
#include <gtk/gtk.h> #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); 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); static Display *_gdk_display PA_GCC_WEAKREF(gdk_display);
#endif #endif
#endif
#include "proplist-util.h" #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); 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 (!pa_proplist_contains(p, PA_PROP_WINDOW_X11_DISPLAY))
if (&_gdk_display && _gdk_display) { if (&_gdk_display && _gdk_display) {
const char *t; 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); pa_proplist_sets(p, PA_PROP_WINDOW_X11_DISPLAY, t);
} }
#endif
#endif #endif
} }