[gtk: 6/6] Merge branch 'wip/matthiasc/immodule-cleanup' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 32873cc94b20f50b1550150c6f0c9c59e07c0da2
Merge: 881046b46e 04cc589a61
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Mar 1 06:38:39 2018 +0000

    Merge branch 'wip/matthiasc/immodule-cleanup' into 'master'
    
    Convert immodules to use an extension point
    
    See merge request GNOME/gtk!34

 build-aux/meson/post-install.sh                    |   5 -
 docs/reference/gtk/building.sgml                   | 137 +---
 docs/reference/gtk/gtk4-docs.xml                   |   1 -
 docs/reference/gtk/gtk4-query-immodules.xml        |  96 ---
 docs/reference/gtk/gtk4-sections.txt               |   1 -
 docs/reference/gtk/meson.build                     |   2 -
 docs/reference/gtk/running.sgml                    |  21 -
 {modules/input => gtk}/gtk-text-input.xml          |   0
 gtk/gtk.h                                          |   1 -
 .../imbroadway.c => gtk/gtkimcontextbroadway.c     |  87 +-
 gtk/{gtkimcontextinfo.h => gtkimcontextbroadway.h} |  25 +-
 {modules/input => gtk}/gtkimcontextime.c           |  39 +-
 {modules/input => gtk}/gtkimcontextime.h           |   2 -
 .../input/imquartz.c => gtk/gtkimcontextquartz.c   |  92 +--
 gtk/gtkimcontextquartz.h                           |  29 +
 gtk/gtkimcontextsimple.c                           |   8 +-
 .../input/imwayland.c => gtk/gtkimcontextwayland.c |  94 +--
 gtk/gtkimcontextwayland.h                          |  29 +
 {modules/input => gtk}/gtkimcontextxim.c           | 162 ++--
 {modules/input => gtk}/gtkimcontextxim.h           |  11 +-
 gtk/gtkimmodule.c                                  | 881 +++------------------
 gtk/gtkimmodule.h                                  |  15 +-
 gtk/gtkimmoduleprivate.h                           |   9 -
 gtk/gtkmain.c                                      |   5 +-
 {modules/input => gtk}/imm-extra.h                 |   0
 gtk/meson.build                                    |  87 +-
 gtk/queryimmodules.c                               | 247 ------
 meson.build                                        |   1 -
 meson_options.txt                                  |   6 -
 modules/input/imime.c                              |  69 --
 modules/input/imxim.c                              |  65 --
 modules/input/meson.build                          | 118 ---
 modules/meson.build                                |   2 -
 33 files changed, 418 insertions(+), 1929 deletions(-)
---