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 066875e9bf47d319acd05e75d7e60260a8789d35..2e0bd9664abc1ff286606494b85caaeb591b526c 100644 (file)
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -23,13 +23,14 @@
  *
  */
 
+#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;
 
@@ -39,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,
@@ -49,13 +50,13 @@ inuktitut_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) inuktitut_init,
+    (GInstanceInitFunc) inuktitut_init,
   };
 
   type_inuktitut_translit = 
     g_type_module_register_type (module,
                                 GTK_TYPE_IM_CONTEXT_SIMPLE,
-                                "GtkIMContextInukitut",
+                                "GtkIMContextInuktitut",
                                 &object_info, 0);
 }
 
@@ -87,11 +88,11 @@ static guint16 inuktitut_compose_seqs[] = {
   SYL('l', 0x14d5, 0x14ea, 2)
   SYL('m', 0x14a5, 0x14bb, 2)
   SYL('n', 0x14c2, 0x14d0, 2)
-  SYL('p', 0x1431, 0x1449, 0)
 
   'o', 0,   0,   0 ,  0,   0x1405, /* as u */
   'o', 'o', 0,   0,   0,   0x1406,
 
+  SYL('p', 0x1431, 0x1449, 0)
   SYL('q', 0x157f, 0x1585, 3)
   SYL('r', 0x1546, 0x1550, 2)
   SYL('s', 0x14ef, 0x1505, 2) /* As h */
@@ -103,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
@@ -123,9 +124,9 @@ inuktitut_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo inuktitut_info = { 
   "inuktitut",            /* ID */
-  N_("Inukitut (Transliterated)"),         /* Human readable name */
-  "gtk+",                 /* Translation domain */
-   GTK_LOCALEDIR,         /* Dir for bindtextdomain (not strictly needed for "gtk+") */
+  N_("Inuktitut (Transliterated)"),         /* Human readable name */
+  GETTEXT_PACKAGE,        /* Translation domain */
+  GTK_LOCALEDIR,          /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "iu"                    /* Languages for which this module is the default */
 };
 
@@ -133,30 +134,32 @@ static const GtkIMContextInfo *info_list[] = {
   &inuktitut_info
 };
 
-void
-im_module_init (GTypeModule *module)
+#ifndef INCLUDE_IM_inuktitut
+#define MODULE_ENTRY(type, function) G_MODULE_EXPORT type im_module_ ## function
+#else
+#define MODULE_ENTRY(type, function) type _gtk_immodule_inuktitut_ ## function
+#endif
+
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   inuktitut_register_type (module);
 }
 
-void 
-im_module_exit (void)
+MODULE_ENTRY (void, exit) (void)
 {
 }
 
-void 
-im_module_list (const GtkIMContextInfo ***contexts,
-               int                      *n_contexts)
+MODULE_ENTRY (void, list) (const GtkIMContextInfo ***contexts,
+                          int                      *n_contexts)
 {
   *contexts = info_list;
   *n_contexts = G_N_ELEMENTS (info_list);
 }
 
-GtkIMContext *
-im_module_create (const gchar *context_id)
+MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
 {
   if (strcmp (context_id, "inuktitut") == 0)
-    return GTK_IM_CONTEXT (gtk_type_new (type_inuktitut_translit));
+    return g_object_new (type_inuktitut_translit, NULL);
   else
     return NULL;
 }