Merge remote-tracking branch 'origin/master' into gdk-backend-wayland

[~andy/gtk] / modules / input / iminuktitut.c

diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index 2311936f632f47bf3381be0231838e86b3f740e1..2e0bd9664abc1ff286606494b85caaeb591b526c 100644 (file)
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -23,14 +23,14 @@
  *
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_inuktitut_translit = 0;
 
@@ -40,7 +40,7 @@ static void inuktitut_init (GtkIMContextSimple *im_context);
 static void
 inuktitut_register_type (GTypeModule *module)
 {
-  static const GTypeInfo object_info =
+  const GTypeInfo object_info =
   {
     sizeof (GtkIMContextSimpleClass),
     (GBaseInitFunc) NULL,
@@ -104,8 +104,8 @@ static guint16 inuktitut_compose_seqs[] = {
   SYL('v', 0x1555, 0x155d, 2) /* as f */
   SYL('y', 0x1528, 0x153e, 2) /* As j */
 
-  SYL(GDK_lstroke, 0x15a0, 0x15a6, 3) /* l- */
-  SYL(GDK_eng, 0x158f, 0x1595, 3)     /* ng */
+  SYL(GDK_KEY_lstroke, 0x15a0, 0x15a6, 3) /* l- */
+  SYL(GDK_KEY_eng, 0x158f, 0x1595, 3)     /* ng */
 };
 
 static void