Change FSF Address

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

diff --git a/modules/input/imime.c b/modules/input/imime.c
index 843917cdabdd3f27e6394c6c2cd19d1a919112a4..7bb5758bba9823cf7e1fb7d09d51fec9936ecc5e 100644 (file)
--- a/modules/input/imime.c
+++ b/modules/input/imime.c
@@ -13,14 +13,12 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #include "gtk/gtkintl.h"
@@ -40,31 +38,27 @@ static const GtkIMContextInfo *info_list[] = {
 };
 
 #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);