Practically everything changed.

[~andy/gtk] / modules / input / imcyrillic-translit.c

diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index 879a4ada85f16b5a91bd9890e7644906d7a88a73..f952537836d98e26b7e622765e614f0171642378 100644 (file)
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 2000 Red Hat Software
  *
  * This library is free software; you can redistribute it and/or
@@ -20,13 +20,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_cyrillic_translit = 0;
 
@@ -46,7 +47,7 @@ cyrillic_translit_register_type (GTypeModule *module)
     NULL,           /* class_data */
     sizeof (GtkIMContextSimple),
     0,
-    (GtkObjectInitFunc) cyrillic_translit_init,
+    (GInstanceInitFunc) cyrillic_translit_init,
   };
 
   type_cyrillic_translit = 
@@ -214,7 +215,7 @@ cyrillic_translit_init (GtkIMContextSimple *im_context)
 static const GtkIMContextInfo cyrillic_translit_info = { 
   "cyrillic_translit",            /* ID */
   N_("Cyrillic (Transliterated)"), /* Human readable name */
-  "gtk+",                         /* Translation domain */
+  GETTEXT_PACKAGE,                /* Translation domain */
    GTK_LOCALEDIR,                 /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   ""                              /* Languages for which this module is the default */
 };
@@ -223,30 +224,32 @@ static const GtkIMContextInfo *info_list[] = {
   &cyrillic_translit_info
 };
 
-void
-im_module_init (GTypeModule *module)
+#ifndef INCLUDE_IM_cyrillic_translit
+#define MODULE_ENTRY(type, function) G_MODULE_EXPORT type im_module_ ## function
+#else
+#define MODULE_ENTRY(type, function) type _gtk_immodule_cyrillic_translit_ ## function
+#endif
+
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   cyrillic_translit_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, "cyrillic_translit") == 0)
-    return GTK_IM_CONTEXT (g_object_new (type_cyrillic_translit, NULL));
+    return g_object_new (type_cyrillic_translit, NULL);
   else
     return NULL;
 }