From 438735dcb64217c5fbb6eb57e83e9f7eefec50b1 Mon Sep 17 00:00:00 2001 From: xclaesse Date: Sat, 9 Feb 2008 21:06:58 +0000 Subject: Do not export symbols outside the empathy_ namespace. git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@613 4ee84921-47dd-4033-b63a-18d7a039a3e4 --- libempathy/Makefile.am | 13 +++++++------ libempathy/empathy-chandler.c | 2 +- libempathy/empathy-contact-list.c | 6 +++--- libempathy/empathy-filter.c | 4 ++-- libempathy/empathy-tp-chat.c | 4 ++-- libempathy/empathy-tp-group.c | 8 ++++---- 6 files changed, 19 insertions(+), 18 deletions(-) (limited to 'libempathy') diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 3c87db37c..a114ad7c8 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -11,7 +11,8 @@ BUILT_SOURCES = \ empathy-enum-types.h \ empathy-enum-types.c \ empathy-filter-glue.h \ - empathy-chandler-glue.h + empathy-chandler-glue.h \ + tp-stream-engine-gen.h lib_LTLIBRARIES = libempathy.la @@ -49,7 +50,8 @@ libempathy_la_LIBADD = \ $(LIBEMPATHY_LIBS) libempathy_la_LDFLAGS = \ - -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} + -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} \ + -export-symbols-regex ^empathy_ libempathy_headers = \ empathy-avatar.h \ @@ -75,8 +77,7 @@ libempathy_headers = \ empathy-chandler.h \ empathy-filter.h \ empathy-idle.h \ - empathy-log-manager.h \ - tp-stream-engine-gen.h + empathy-log-manager.h libempathy_includedir = $(includedir)/libempathy/ libempathy_include_HEADERS = \ @@ -84,11 +85,11 @@ libempathy_include_HEADERS = \ empathy-enum-types.h %-marshal.h: %-marshal.list Makefile - $(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h + $(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h %-marshal.c: %-marshal.list Makefile echo "#include \"empathy-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c + $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c empathy-chandler-glue.h: empathy-chandler.xml Makefile $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=empathy_chandler --mode=glib-server --output=$@ $< diff --git a/libempathy/empathy-chandler.c b/libempathy/empathy-chandler.c index 2ebbde968..a91e55dc9 100644 --- a/libempathy/empathy-chandler.c +++ b/libempathy/empathy-chandler.c @@ -62,7 +62,7 @@ empathy_chandler_class_init (EmpathyChandlerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT, + _empathy_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TELEPATHY_CONN_TYPE, TELEPATHY_CHAN_TYPE); } diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index 510e41957..c34dc5334 100644 --- a/libempathy/empathy-contact-list.c +++ b/libempathy/empathy-contact-list.c @@ -59,7 +59,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN, + _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN, G_TYPE_NONE, 5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); @@ -69,7 +69,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN, + _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN, G_TYPE_NONE, 5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); @@ -79,7 +79,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_STRING_BOOLEAN, + _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN, G_TYPE_NONE, 3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_BOOLEAN); diff --git a/libempathy/empathy-filter.c b/libempathy/empathy-filter.c index 700f9819b..fb8a5208e 100644 --- a/libempathy/empathy-filter.c +++ b/libempathy/empathy-filter.c @@ -78,7 +78,7 @@ empathy_filter_class_init (EmpathyFilterClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT, + _empathy_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TELEPATHY_CONN_TYPE, TELEPATHY_CHAN_TYPE); @@ -88,7 +88,7 @@ empathy_filter_class_init (EmpathyFilterClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__UINT_BOOLEAN, + _empathy_marshal_VOID__UINT_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_BOOLEAN); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 7a7f8dfec..5e166cac9 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -302,7 +302,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_UINT, + _empathy_marshal_VOID__OBJECT_UINT, G_TYPE_NONE, 2, EMPATHY_TYPE_MESSAGE, G_TYPE_UINT); @@ -312,7 +312,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_UINT, + _empathy_marshal_VOID__OBJECT_UINT, G_TYPE_NONE, 2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT); diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c index 30a0097c6..c20bf2053 100644 --- a/libempathy/empathy-tp-group.c +++ b/libempathy/empathy-tp-group.c @@ -501,7 +501,7 @@ empathy_tp_group_class_init (EmpathyTpGroupClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, + _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, G_TYPE_NONE, 4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING); @@ -511,7 +511,7 @@ empathy_tp_group_class_init (EmpathyTpGroupClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, + _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, G_TYPE_NONE, 4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING); @@ -521,7 +521,7 @@ empathy_tp_group_class_init (EmpathyTpGroupClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, + _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, G_TYPE_NONE, 4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING); @@ -531,7 +531,7 @@ empathy_tp_group_class_init (EmpathyTpGroupClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, + _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, G_TYPE_NONE, 4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING); -- cgit v1.2.3