applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

details: Don't crash on Wayland

Browse source 
We were just assuming that there is an X server around. This may
not be the case anymore, so check, and deal with running under
Wayland. For now, we just say 'Wayland'. We should do better here,
eventually.

https://bugzilla.gnome.org/show_bug.cgi?id=728672
This commit is contained in:
Matthias Clasen 2014-04-21 14:12:12 -04:00
parent cd498a06b3
commit 71a8d89457
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
panels/info/cc-info-panel.c
View file

@ -34,6 +34,7 @@
#include <glibtop/mem.h> #include <glibtop/mem.h>
#include <glibtop/sysinfo.h> #include <glibtop/sysinfo.h>
#include <gdk/gdkwayland.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
@ -426,11 +427,32 @@ static GraphicsData *
get_graphics_data (void) get_graphics_data (void)
{ {
GraphicsData *result; GraphicsData *result;
GdkDisplay *display;
result = g_slice_new0 (GraphicsData); result = g_slice_new0 (GraphicsData);
display = gdk_display_get_default ();
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display))
{
result->glx_renderer = get_graphics_data_glx_renderer (); result->glx_renderer = get_graphics_data_glx_renderer ();
result->xorg_vesa_hardware = get_graphics_data_xorg_vesa_hardware (); result->xorg_vesa_hardware = get_graphics_data_xorg_vesa_hardware ();
}
else
#endif
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (display))
{
result->glx_renderer = _("Wayland");
result->xorg_vesa_hardware = NULL;
}
else
#endif
{
result->glx_renderer = NULL;
result->xorg_vesa_hardware = NULL;
}
if (result->xorg_vesa_hardware != NULL) if (result->xorg_vesa_hardware != NULL)
result->hardware_string = result->xorg_vesa_hardware; result->hardware_string = result->xorg_vesa_hardware;