[gtk/cherry-pick-f431e28c] gtkimcontextsimple.c: Use X11_DATA_PREFIX only on X11
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/cherry-pick-f431e28c] gtkimcontextsimple.c: Use X11_DATA_PREFIX only on X11
- Date: Sat, 23 Nov 2019 06:34:45 +0000 (UTC)
commit 45bcc89a01133345fa80bf9df627683fac8aeac1
Author: Quentin Glidic <sardemff7+git sardemff7 net>
Date: Thu Jul 6 14:31:46 2017 +0000
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>
(cherry picked from commit f431e28ce36a1672bddc0661bcdff129304037d0)
gtk/gtkimcontextsimple.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 6ec29dd193..5dc724cf70 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -140,7 +140,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]