From d499451f3eb60ed8e0988300fd7b3cb01a3d63ec Mon Sep 17 00:00:00 2001 From: fliep Date: Mon, 3 May 2010 17:58:05 +0000 Subject: [PATCH] Added underscore to prevent marshaller functions from being exported in library --- libchimara/Makefile.am | 4 ++-- libchimara/chimara-glk.c | 6 +++--- libchimara/chimara-if.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am index b70acb9..f932d3b 100644 --- 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 59f99ac..5162046 100644 --- 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 2c26fbf..ee91bf9 100644 --- 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 */ -- 2.30.2