include <pango/pango.h> instead of <pango/pango-layout.h>.

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

diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index c7c9a0370b4e1e69c7c762f5495cb6c474750159..cf7fdb595e0e656d627fcd73a4a970be36729282 100644 (file)
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -225,32 +225,28 @@ static const GtkIMContextInfo *info_list[] = {
 };
 
 #ifndef INCLUDE_IM_cyrillic_translit
-#define MODULE_ENTRY(function) G_MODULE_EXPORT im_module_ ## function
+#define MODULE_ENTRY(type, function) G_MODULE_EXPORT type im_module_ ## function
 #else
-#define MODULE_ENTRY(function) _gtk_immodule_cyrillic_translit_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_cyrillic_translit_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   cyrillic_translit_register_type (module);
 }
 
-void 
-MODULE_ENTRY (exit) (void)
+MODULE_ENTRY (void, exit) (void)
 {
 }
 
-void 
-MODULE_ENTRY (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 *
-MODULE_ENTRY (create) (const gchar *context_id)
+MODULE_ENTRY (GtkIMContext *, create) (const gchar *context_id)
 {
   if (strcmp (context_id, "cyrillic_translit") == 0)
     return g_object_new (type_cyrillic_translit, NULL);