empathy r613 - in trunk: docs/libempathy-gtk libempathy libempathy-gtk

From: xclaesse svn gnome org
To: svn-commits-list gnome org
Subject: empathy r613 - in trunk: docs/libempathy-gtk libempathy libempathy-gtk
Date: Sat, 9 Feb 2008 21:06:59 +0000 (GMT)
Author: xclaesse
Date: Sat Feb  9 21:06:58 2008
New Revision: 613
URL: http://svn.gnome.org/viewvc/empathy?rev=613&view=rev

Log:
Do not export symbols outside the empathy_ namespace.


Modified:
   trunk/docs/libempathy-gtk/Makefile.am
   trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml
   trunk/docs/libempathy-gtk/libempathy-gtk.types
   trunk/libempathy-gtk/Makefile.am
   trunk/libempathy-gtk/empathy-chat.c
   trunk/libempathy-gtk/empathy-contact-list-view.c
   trunk/libempathy-gtk/empathy-presence-chooser.c
   trunk/libempathy-gtk/empathy-theme.c
   trunk/libempathy/Makefile.am
   trunk/libempathy/empathy-chandler.c
   trunk/libempathy/empathy-contact-list.c
   trunk/libempathy/empathy-filter.c
   trunk/libempathy/empathy-tp-chat.c
   trunk/libempathy/empathy-tp-group.c

Modified: trunk/docs/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/docs/libempathy-gtk/Makefile.am	(original)
+++ trunk/docs/libempathy-gtk/Makefile.am	Sat Feb  9 21:06:58 2008
@@ -21,6 +21,7 @@
 IGNORE_HFILES=				\
 	empathy-gtk-enum-types.h	\
 	stamp-empathy-gtk-enum-types.h	\
+	ephy-spinner.h			\
 	$(NULL)
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed

Modified: trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml
==============================================================================
--- trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml	(original)
+++ trunk/docs/libempathy-gtk/libempathy-gtk-docs.sgml	Sat Feb  9 21:06:58 2008
@@ -55,7 +55,6 @@
     <xi:include href="xml/empathy-status-icon.xml"/>
     <xi:include href="xml/empathy-theme-manager.xml"/>
     <xi:include href="xml/empathy-ui-utils.xml"/>
-    <xi:include href="xml/ephy-spinner.xml"/>
     </chapter>
   </part>
 

Modified: trunk/docs/libempathy-gtk/libempathy-gtk.types
==============================================================================
--- trunk/docs/libempathy-gtk/libempathy-gtk.types	(original)
+++ trunk/docs/libempathy-gtk/libempathy-gtk.types	Sat Feb  9 21:06:58 2008
@@ -22,5 +22,4 @@
 empathy_theme_get_type
 empathy_theme_irc_get_type
 empathy_theme_manager_get_type
-ephy_spinner_get_type
 

Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am	(original)
+++ trunk/libempathy-gtk/Makefile.am	Sat Feb  9 21:06:58 2008
@@ -64,7 +64,8 @@
 	$(top_builddir)/libempathy/libempathy.la
 
 libempathy_gtk_la_LDFLAGS =                \
-       -version-info ${LIBEMPATHY_GTK_CURRENT}:${LIBEMPATHY_GTK_REVISION}:${LIBEMPATHY_GTK_AGE}
+       -version-info ${LIBEMPATHY_GTK_CURRENT}:${LIBEMPATHY_GTK_REVISION}:${LIBEMPATHY_GTK_AGE} \
+       -export-symbols-regex ^empathy_
 
 libempathy_gtk_headers =			\
 	empathy-images.h			\

Modified: trunk/libempathy-gtk/empathy-chat.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.c	(original)
+++ trunk/libempathy-gtk/empathy-chat.c	Sat Feb  9 21:06:58 2008
@@ -279,7 +279,7 @@
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      empathy_marshal_VOID__OBJECT_BOOLEAN,
+			      _empathy_marshal_VOID__OBJECT_BOOLEAN,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
 

Modified: trunk/libempathy-gtk/empathy-contact-list-view.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-list-view.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-list-view.c	Sat Feb  9 21:06:58 2008
@@ -322,7 +322,7 @@
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      empathy_marshal_VOID__OBJECT_STRING_STRING,
+			      _empathy_marshal_VOID__OBJECT_STRING_STRING,
 			      G_TYPE_NONE,
 			      3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
 

Modified: trunk/libempathy-gtk/empathy-presence-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-presence-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-presence-chooser.c	Sat Feb  9 21:06:58 2008
@@ -37,7 +37,6 @@
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-marshal.h>
 #include <libempathy/empathy-status-presets.h>
 
 #include "empathy-ui-utils.h"

Modified: trunk/libempathy-gtk/empathy-theme.c
==============================================================================
--- trunk/libempathy-gtk/empathy-theme.c	(original)
+++ trunk/libempathy-gtk/empathy-theme.c	Sat Feb  9 21:06:58 2008
@@ -26,7 +26,6 @@
 
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-marshal.h>
 
 #include "empathy-chat.h"
 #include "empathy-conf.h"

Modified: trunk/libempathy/Makefile.am
==============================================================================
--- trunk/libempathy/Makefile.am	(original)
+++ trunk/libempathy/Makefile.am	Sat Feb  9 21:06:58 2008
@@ -11,7 +11,8 @@
 	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_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 @@
 	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 @@
 	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=$@ $<

Modified: trunk/libempathy/empathy-chandler.c
==============================================================================
--- trunk/libempathy/empathy-chandler.c	(original)
+++ trunk/libempathy/empathy-chandler.c	Sat Feb  9 21:06:58 2008
@@ -62,7 +62,7 @@
 			      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);
 }

Modified: trunk/libempathy/empathy-contact-list.c
==============================================================================
--- trunk/libempathy/empathy-contact-list.c	(original)
+++ trunk/libempathy/empathy-contact-list.c	Sat Feb  9 21:06:58 2008
@@ -59,7 +59,7 @@
 			      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 @@
 			      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 @@
 			      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);
 

Modified: trunk/libempathy/empathy-filter.c
==============================================================================
--- trunk/libempathy/empathy-filter.c	(original)
+++ trunk/libempathy/empathy-filter.c	Sat Feb  9 21:06:58 2008
@@ -78,7 +78,7 @@
 			      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 @@
 			      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);
 

Modified: trunk/libempathy/empathy-tp-chat.c
==============================================================================
--- trunk/libempathy/empathy-tp-chat.c	(original)
+++ trunk/libempathy/empathy-tp-chat.c	Sat Feb  9 21:06:58 2008
@@ -302,7 +302,7 @@
 			      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 @@
 			      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);
 

Modified: trunk/libempathy/empathy-tp-group.c
==============================================================================
--- trunk/libempathy/empathy-tp-group.c	(original)
+++ trunk/libempathy/empathy-tp-group.c	Sat Feb  9 21:06:58 2008
@@ -501,7 +501,7 @@
 			      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 @@
 			      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 @@
 			      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 @@
 			      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);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]