Added underscore to prevent marshaller functions from being exported in library

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index b70acb9ad7a35421438f9ff7c91364b5a5cdc356..f932d3ba66f0e4d8d712a208c59b3ede603c85d8 100644 (file)
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -64,9 +64,9 @@ libchimara_include_HEADERS = \
 
 BUILT_SOURCES = chimara-marshallers.c chimara-marshallers.h
 chimara-marshallers.c: chimara-marshallers.txt
-       glib-genmarshal --body --prefix=chimara_marshal $< > $@
+       glib-genmarshal --body --prefix=_chimara_marshal $< > $@
 
 chimara-marshallers.h: chimara-marshallers.txt
-       glib-genmarshal --header --prefix=chimara_marshal $< > $@
+       glib-genmarshal --header --prefix=_chimara_marshal $< > $@
 
 EXTRA_DIST = doc.c glkstart.c chimara-marshallers.txt

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 59f99ac8f4c9069b450d3f42c193667cdeb93f9d..5162046fee0470530782c1f09fa28f2b35287bd6 100644 (file)
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -768,7 +768,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
        chimara_glk_signals[CHAR_INPUT] = g_signal_new("char-input",
                G_OBJECT_CLASS_TYPE(klass), 0,
                G_STRUCT_OFFSET(ChimaraGlkClass, char_input), NULL, NULL,
-               chimara_marshal_VOID__UINT_UINT,
+               _chimara_marshal_VOID__UINT_UINT,
                G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
        /**
         * ChimaraGlk::line-input:
@@ -782,7 +782,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
        chimara_glk_signals[LINE_INPUT] = g_signal_new("line-input",
                G_OBJECT_CLASS_TYPE(klass), 0,
                G_STRUCT_OFFSET(ChimaraGlkClass, line_input), NULL, NULL,
-               chimara_marshal_VOID__UINT_STRING,
+               _chimara_marshal_VOID__UINT_STRING,
                G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
        /**
         * ChimaraGlk::text-buffer-output:
@@ -795,7 +795,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
        chimara_glk_signals[TEXT_BUFFER_OUTPUT] = g_signal_new("text-buffer-output",
                G_OBJECT_CLASS_TYPE(klass), 0,
                G_STRUCT_OFFSET(ChimaraGlkClass, text_buffer_output), NULL, NULL,
-               chimara_marshal_VOID__UINT_STRING,
+               _chimara_marshal_VOID__UINT_STRING,
                G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
     /* Properties */

diff --git a/libchimara/chimara-if.c b/libchimara/chimara-if.c
index 2c26fbf7290c748ad25be18edb5a077b2f05065b..ee91bf9e57e275b61ac1632d83bdadde310911bd 100644 (file)
--- a/libchimara/chimara-if.c
+++ b/libchimara/chimara-if.c
@@ -291,7 +291,7 @@ chimara_if_class_init(ChimaraIFClass *klass)
        chimara_if_signals[COMMAND] = g_signal_new("command",
                G_OBJECT_CLASS_TYPE(klass), 0,
                G_STRUCT_OFFSET(ChimaraIFClass, command), NULL, NULL,
-               chimara_marshal_VOID__STRING_STRING,
+               _chimara_marshal_VOID__STRING_STRING,
                G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
        /* Properties */