[gtk/gtk-3-22: 3/3] Merge branch 'wip/carlosg/imwayland-3-22' into 'gtk-3-22'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-22: 3/3] Merge branch 'wip/carlosg/imwayland-3-22' into 'gtk-3-22'
- Date: Thu, 15 Feb 2018 03:03:57 +0000 (UTC)
commit 9f142161e491b4656d5f9b4884643b038cba1eed
Merge: 463ee95136 e8bffe0c56
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Feb 15 03:03:02 2018 +0000
Merge branch 'wip/carlosg/imwayland-3-22' into 'gtk-3-22'
modules: Add wayland IM implementation
See merge request GNOME/gtk!5
configure.ac | 2 +
docs/reference/gdk/gdk3-sections.txt | 1 +
gdk/wayland/gdkdisplay-wayland.c | 42 ++-
gdk/wayland/gdkwaylanddisplay.h | 4 +
gtk/gtkimmodule.c | 3 +
gtk/gtksettings.c | 25 ++
modules/input/Makefile.am | 46 +++
modules/input/gtk-text-input.xml | 302 +++++++++++++++
modules/input/imwayland.c | 686 +++++++++++++++++++++++++++++++++++
9 files changed, 1105 insertions(+), 6 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]