From 18f3035a0a103505889a474c03d5a0fe149d945a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 31 Aug 2009 05:08:34 +0200 Subject: [PATCH 2/3] Use _polkit_agent_marshal prefix Use _polkit_agent_marshal prefix with glib-genmarshal to hide the (autogenerated) symbols. Update the code accordingly. --- src/polkitagent/Makefile.am | 4 ++-- src/polkitagent/polkitagentsession.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am index 0286c21..1903e0a 100644 --- a/src/polkitagent/Makefile.am +++ b/src/polkitagent/Makefile.am @@ -22,8 +22,8 @@ BUILT_SOURCES = \ $(NULL) marshal.stamp : Makefile.am $(srcdir)/polkitagentmarshal.list - glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h - (echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c + glib-genmarshal --prefix=_polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --header > polkitagentmarshal.h.tmp && mv polkitagentmarshal.h.tmp polkitagentmarshal.h + (echo "#include \"polkitagentmarshal.h\""; glib-genmarshal --prefix=_polkit_agent_marshal $(srcdir)/polkitagentmarshal.list --body) > polkitagentmarshal.c.tmp && mv polkitagentmarshal.c.tmp polkitagentmarshal.c touch marshal.stamp marshal_built_sources = polkitagentmarshal.h polkitagentmarshal.c diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c index 4327b4b..b919e0a 100644 --- a/src/polkitagent/polkitagentsession.c +++ b/src/polkitagent/polkitagentsession.c @@ -156,7 +156,7 @@ polkit_agent_session_class_init (PolkitAgentSessionClass *klass) 0, /* class offset */ NULL, /* accumulator */ NULL, /* accumulator data */ - polkit_agent_marshal_VOID__STRING_BOOLEAN, + _polkit_agent_marshal_VOID__STRING_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_STRING, -- 1.6.3.3