summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2013-12-05 16:56:10 +0100
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2013-12-05 16:56:10 +0100
commit2b7e367207f18a4e965e0bf1105e3af5b05ce7d6 (patch)
treec114083b47082644a7f07b0f4ac5425e992237a5
parentb5090695c2f928c33ad3c3cef89bf04deb8829d8 (diff)
downloadgraynard-2b7e367207f18a4e965e0bf1105e3af5b05ce7d6.tar.gz
graynard-2b7e367207f18a4e965e0bf1105e3af5b05ce7d6.zip
Tell gtk+ we really need the wayland backend
So that it doesn't choose the x11 backend when DISPLAY is set, e.g. when running weston on x11 or when xwayland is available. Require gtk+ 3.10 for this.
-rw-r--r--configure.ac2
-rw-r--r--shell/gtk-shell.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 6503785..9873baf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES([GTK], [
wayland-client >= 1.0.2
weston >= 1.3.0
- gtk+-3.0 >= 3.7
+ gtk+-3.0 >= 3.10
gtk+-wayland-3.0
libgnome-menu-3.0
gnome-desktop-3.0
diff --git a/shell/gtk-shell.c b/shell/gtk-shell.c
index c060b49..86eeef5 100644
--- a/shell/gtk-shell.c
+++ b/shell/gtk-shell.c
@@ -254,6 +254,8 @@ main(int argc, char *argv[])
{
struct desktop *desktop;
+ gdk_set_allowed_backends ("wayland");
+
gtk_init(&argc, &argv);
desktop = malloc(sizeof *desktop);