gtkimcontextsimple.c: Use X11_DATA_PREFIX only on X11
authorQuentin Glidic <sardemff7+git@sardemff7.net>
Thu, 6 Jul 2017 14:31:46 +0000 (16:31 +0200)
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>
Mon, 19 Mar 2018 10:39:47 +0000 (11:39 +0100)
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>
gtk/gtkimcontextsimple.c

index fe11e7c332257af47997b497de482f3d3ee10f53..3995b002c63c27c78d6152abcdc3b49610a0ba62 100644 (file)
@@ -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);