marshal code is autogenerated, in Makefile.am

4 files changed, 39 insertions, 32 deletions

diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
index 64378e4..3eea793 100644
--- a/libxklavier/Makefile.am
+++ b/libxklavier/Makefile.am
@@ -16,6 +16,14 @@ endif
 
 EXTRA_DIST=marshal.list
 
+GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
+
+xkl_engine_marshal.h: marshal.list
+	$(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --header > xkl_engine_marshal.h
+
+xkl_engine_marshal.c: xkl_engine_marshal.h
+	$(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c
+
 AM_CFLAGS=-Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
   -I. -I$(includedir) -I$(x_includes) -I$(top_srcdir) \
   $(XML_CFLAGS) $(GLIB_CFLAGS) \
diff --git a/libxklavier/xkl_engine_marshal.c b/libxklavier/xkl_engine_marshal.c
index 6cd987b..ac10620 100644
--- a/libxklavier/xkl_engine_marshal.c
+++ b/libxklavier/xkl_engine_marshal.c
@@ -51,12 +51,12 @@
 
 /* INT:LONG,LONG (marshal.list:2) */
 void
-g_cclosure_user_marshal_INT__LONG_LONG (GClosure     *closure,
-                                        GValue       *return_value,
-                                        guint         n_param_values,
-                                        const GValue *param_values,
-                                        gpointer      invocation_hint,
-                                        gpointer      marshal_data)
+xkl_engine_INT__LONG_LONG (GClosure     *closure,
+                           GValue       *return_value,
+                           guint         n_param_values,
+                           const GValue *param_values,
+                           gpointer      invocation_hint,
+                           gpointer      marshal_data)
 {
   typedef gint (*GMarshalFunc_INT__LONG_LONG) (gpointer     data1,
                                                glong        arg_1,
@@ -92,12 +92,12 @@ g_cclosure_user_marshal_INT__LONG_LONG (GClosure     *closure,
 
 /* VOID:FLAGS,INT,BOOLEAN (marshal.list:3) */
 void
-g_cclosure_user_marshal_VOID__FLAGS_INT_BOOLEAN (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data)
+xkl_engine_VOID__FLAGS_INT_BOOLEAN (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data)
 {
   typedef void (*GMarshalFunc_VOID__FLAGS_INT_BOOLEAN) (gpointer     data1,
                                                         guint        arg_1,
diff --git a/libxklavier/xkl_engine_marshal.h b/libxklavier/xkl_engine_marshal.h
index f0cd56d..1481b87 100644
--- a/libxklavier/xkl_engine_marshal.h
+++ b/libxklavier/xkl_engine_marshal.h
@@ -1,31 +1,31 @@
 
-#ifndef __g_cclosure_user_marshal_MARSHAL_H__
-#define __g_cclosure_user_marshal_MARSHAL_H__
+#ifndef __xkl_engine_MARSHAL_H__
+#define __xkl_engine_MARSHAL_H__
 
 #include	<glib-object.h>
 
 G_BEGIN_DECLS
 
 /* VOID:VOID (marshal.list:1) */
-#define g_cclosure_user_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
+#define xkl_engine_VOID__VOID	g_cclosure_marshal_VOID__VOID
 
 /* INT:LONG,LONG (marshal.list:2) */
-extern void g_cclosure_user_marshal_INT__LONG_LONG (GClosure     *closure,
-                                                    GValue       *return_value,
-                                                    guint         n_param_values,
-                                                    const GValue *param_values,
-                                                    gpointer      invocation_hint,
-                                                    gpointer      marshal_data);
+extern void xkl_engine_INT__LONG_LONG (GClosure     *closure,
+                                       GValue       *return_value,
+                                       guint         n_param_values,
+                                       const GValue *param_values,
+                                       gpointer      invocation_hint,
+                                       gpointer      marshal_data);
 
 /* VOID:FLAGS,INT,BOOLEAN (marshal.list:3) */
-extern void g_cclosure_user_marshal_VOID__FLAGS_INT_BOOLEAN (GClosure     *closure,
-                                                             GValue       *return_value,
-                                                             guint         n_param_values,
-                                                             const GValue *param_values,
-                                                             gpointer      invocation_hint,
-                                                             gpointer      marshal_data);
+extern void xkl_engine_VOID__FLAGS_INT_BOOLEAN (GClosure     *closure,
+                                                GValue       *return_value,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint,
+                                                gpointer      marshal_data);
 
 G_END_DECLS
 
-#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */
+#endif /* __xkl_engine_MARSHAL_H__ */
 
diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c
index 8221d61..b318dea 100644
--- a/libxklavier/xklavier.c
+++ b/libxklavier/xklavier.c
@@ -857,20 +857,19 @@ xkl_engine_class_init(XklEngineClass * klass)
 	g_signal_new("X-config-changed", XKL_TYPE_ENGINE,
 		     G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(XklEngineClass,
 							config_notify),
-		     NULL, NULL, g_cclosure_user_marshal_VOID__VOID,
-		     G_TYPE_NONE, 0);
+		     NULL, NULL, xkl_engine_VOID__VOID, G_TYPE_NONE, 0);
 
 	g_signal_new("new-toplevel-window", XKL_TYPE_ENGINE,
 		     G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(XklEngineClass,
 							new_window_notify),
-		     NULL, NULL, g_cclosure_user_marshal_INT__LONG_LONG,
+		     NULL, NULL, xkl_engine_INT__LONG_LONG,
 		     G_TYPE_INT, 2, G_TYPE_LONG, G_TYPE_LONG);
 
 	g_signal_new("X-state-changed", XKL_TYPE_ENGINE,
 		     G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(XklEngineClass,
 							state_notify),
 		     NULL, NULL,
-		     g_cclosure_user_marshal_VOID__FLAGS_INT_BOOLEAN,
+		     xkl_engine_VOID__FLAGS_INT_BOOLEAN,
 		     G_TYPE_NONE, 3, state_change_type, G_TYPE_INT,
 		     G_TYPE_BOOLEAN);