From: Quentin Glidic <sardemff7+git@sardemff7.net>
Date: Thu, 6 Jul 2017 14:31:46 +0000 (+0200)
Subject: gtkimcontextsimple.c: Use X11_DATA_PREFIX only on X11
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~880
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f431e28ce36a1672bddc0661bcdff129304037d0;p=gtk4.git

gtkimcontextsimple.c: Use X11_DATA_PREFIX only on X11

Unlike what commit d01ea18dc3a9acc98fc133ddb53ddc838e4e18f9 says, X11 is
not a requirement for Wayland, so a Wayland-only build is possible. We
just use the same logic as other non-X11 platforms.

https://bugzilla.gnome.org/show_bug.cgi?id=784615

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
---

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index fe11e7c332..3995b002c6 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -191,7 +191,7 @@ get_x11_compose_file_dir (void)
 {
   gchar* compose_file_dir;
 
-#if defined (GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WAYLAND)
+#if defined (GDK_WINDOWING_X11)
   compose_file_dir = g_strdup (X11_DATA_PREFIX "/share/X11/locale");
 #else
   compose_file_dir = g_build_filename (_gtk_get_datadir (), "X11", "locale", NULL);