modules/input/gtkimcontextime.c modules/input/gtkimcontextmultipress.c use

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

diff --git a/modules/input/immultipress.c b/modules/input/immultipress.c
index 6430eaabf960c89c986fad3401c8e61f81f1be6a..1aa84d82b2310dba665bea9f327bbe701c2a08ed 100644 (file)
--- a/modules/input/immultipress.c
+++ b/modules/input/immultipress.c
@@ -18,7 +18,7 @@
 
 #include "gtkimcontextmultipress.h"
 #include <gtk/gtkimmodule.h> /* For GtkIMContextInfo */
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n.h>
 #include <string.h> /* For strcmp() */
 
@@ -39,32 +39,28 @@ static const GtkIMContextInfo *info_list[] = {
 };
 
 #ifndef INCLUDE_IM_multipress
-#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_multipress_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_multipress_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   gtk_im_context_multipress_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, CONTEXT_ID) == 0)
   {