gtk+ r19902 - in trunk: . modules/input

[tml svn gnome org]

Author: tml
Date: Tue Mar 18 21:29:00 2008
New Revision: 19902
URL: http://svn.gnome.org/viewvc/gtk+?rev=19902&view=rev

Log:
2008-03-18  Tor Lillqvist  <tml novell com>

	Bug 523225 - modules/input/im*.c: MODULE_ENTRY macros make illegal code
	
	* modules/input/im*.c: Modify the MODULE_ENTRY macro so the
	G_MODULE_ENTRY decoration can be put in a more correct place.



Modified:
   trunk/ChangeLog
   trunk/modules/input/imam-et.c
   trunk/modules/input/imcedilla.c
   trunk/modules/input/imcyrillic-translit.c
   trunk/modules/input/imime.c
   trunk/modules/input/iminuktitut.c
   trunk/modules/input/imipa.c
   trunk/modules/input/immultipress.c
   trunk/modules/input/imthai.c
   trunk/modules/input/imti-er.c
   trunk/modules/input/imti-et.c
   trunk/modules/input/imviqr.c
   trunk/modules/input/imxim.c

Modified: trunk/modules/input/imam-et.c
==============================================================================
--- trunk/modules/input/imam-et.c	(original)
+++ trunk/modules/input/imam-et.c	Tue Mar 18 21:29:00 2008
@@ -462,32 +462,28 @@
 };
 
 #ifndef INCLUDE_IM_am_et
-#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_am_et_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_am_et_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   am_et_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, "am_et") == 0)
     return g_object_new (type_am_et_translit, NULL);

Modified: trunk/modules/input/imcedilla.c
==============================================================================
--- trunk/modules/input/imcedilla.c	(original)
+++ trunk/modules/input/imcedilla.c	Tue Mar 18 21:29:00 2008
@@ -99,32 +99,28 @@
 };
 
 #ifndef INCLUDE_IM_cedilla
-#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_cedilla_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_cedilla_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   cedilla_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, "cedilla") == 0)
     return g_object_new (type_cedilla, NULL);

Modified: trunk/modules/input/imcyrillic-translit.c
==============================================================================
--- trunk/modules/input/imcyrillic-translit.c	(original)
+++ trunk/modules/input/imcyrillic-translit.c	Tue Mar 18 21:29:00 2008
@@ -225,32 +225,28 @@
 };
 
 #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);

Modified: trunk/modules/input/imime.c
==============================================================================
--- trunk/modules/input/imime.c	(original)
+++ trunk/modules/input/imime.c	Tue Mar 18 21:29:00 2008
@@ -40,31 +40,27 @@
 };
 
 #ifndef INCLUDE_IM_ime
-#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_ime_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_ime_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule * module)
+MODULE_ENTRY (void, init) (GTypeModule * module)
 {
   gtk_im_context_ime_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)
 {
   g_return_val_if_fail (context_id, NULL);
 

Modified: trunk/modules/input/iminuktitut.c
==============================================================================
--- trunk/modules/input/iminuktitut.c	(original)
+++ trunk/modules/input/iminuktitut.c	Tue Mar 18 21:29:00 2008
@@ -135,32 +135,28 @@
 };
 
 #ifndef INCLUDE_IM_inuktitut
-#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_inuktitut_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_inuktitut_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   inuktitut_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, "inuktitut") == 0)
     return g_object_new (type_inuktitut_translit, NULL);

Modified: trunk/modules/input/imipa.c
==============================================================================
--- trunk/modules/input/imipa.c	(original)
+++ trunk/modules/input/imipa.c	Tue Mar 18 21:29:00 2008
@@ -153,32 +153,28 @@
 };
 
 #ifndef INCLUDE_IM_ipa
-#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_ipa_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_ipa_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   ipa_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, "ipa") == 0)
     return g_object_new (type_ipa, NULL);

Modified: trunk/modules/input/immultipress.c
==============================================================================
--- trunk/modules/input/immultipress.c	(original)
+++ trunk/modules/input/immultipress.c	Tue Mar 18 21:29:00 2008
@@ -39,32 +39,28 @@
 };
 
 #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)
   {

Modified: trunk/modules/input/imthai.c
==============================================================================
--- trunk/modules/input/imthai.c	(original)
+++ trunk/modules/input/imthai.c	Tue Mar 18 21:29:00 2008
@@ -43,32 +43,28 @@
 };
 
 #ifndef INCLUDE_IM_thai
-#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_thai_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_thai_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   gtk_im_context_thai_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, "thai") == 0)
     return gtk_im_context_thai_new ();

Modified: trunk/modules/input/imti-er.c
==============================================================================
--- trunk/modules/input/imti-er.c	(original)
+++ trunk/modules/input/imti-er.c	Tue Mar 18 21:29:00 2008
@@ -461,32 +461,28 @@
 };
 
 #ifndef INCLUDE_IM_ti_er
-#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_ti_er_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_ti_er_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   ti_er_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, "ti_er") == 0)
     return g_object_new (type_ti_er_translit, NULL);

Modified: trunk/modules/input/imti-et.c
==============================================================================
--- trunk/modules/input/imti-et.c	(original)
+++ trunk/modules/input/imti-et.c	Tue Mar 18 21:29:00 2008
@@ -461,32 +461,28 @@
 };
 
 #ifndef INCLUDE_IM_ti_et
-#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_ti_et_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_ti_et_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   ti_et_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, "ti_et") == 0)
     return g_object_new (type_ti_et_translit, NULL);

Modified: trunk/modules/input/imviqr.c
==============================================================================
--- trunk/modules/input/imviqr.c	(original)
+++ trunk/modules/input/imviqr.c	Tue Mar 18 21:29:00 2008
@@ -252,32 +252,28 @@
 };
 
 #ifndef INCLUDE_IM_viqr
-#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_viqr_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_viqr_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *module)
+MODULE_ENTRY (void, init) (GTypeModule *module)
 {
   viqr_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, "viqr") == 0)
     return g_object_new (type_viqr_translit, NULL);

Modified: trunk/modules/input/imxim.c
==============================================================================
--- trunk/modules/input/imxim.c	(original)
+++ trunk/modules/input/imxim.c	Tue Mar 18 21:29:00 2008
@@ -36,33 +36,29 @@
 };
 
 #ifndef INCLUDE_IM_xim
-#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_xim_ ## function
+#define MODULE_ENTRY(type, function) type _gtk_immodule_xim_ ## function
 #endif
 
-void
-MODULE_ENTRY (init) (GTypeModule *type_module)
+MODULE_ENTRY (void, init) (GTypeModule *type_module)
 {
   gtk_im_context_xim_register_type (type_module);
 }
 
-void 
-MODULE_ENTRY (exit) (void)
+MODULE_ENTRY (void, exit) (void)
 {
   gtk_im_context_xim_shutdown ();
 }
 
-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, "xim") == 0)
     return gtk_im_context_xim_new ();