Do not export symbols outside the empathy_ namespace.

svn path=/trunk/; revision=613

diff --git a/docs/libempathy-gtk/Makefile.am b/docs/libempathy-gtk/Makefile.am
index 2e8f2020d20656a4241f767f8b0a90a3219a9c7a..ef71cdc853b634a62f2cf8d5ace9bb7c44b30606 100644 (file)
--- a/docs/libempathy-gtk/Makefile.am
+++ b/docs/libempathy-gtk/Makefile.am
@@ -21,6 +21,7 @@ CFILE_GLOB=$(top_srcdir)/libempathy-gtk/*.c
 IGNORE_HFILES=                         \
        empathy-gtk-enum-types.h        \
        stamp-empathy-gtk-enum-types.h  \
 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
        $(NULL)
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed

diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml
index 774f051464bb789a425f9818f506c311e749c5ea..1fb4c383b721b2ac9983f4e2ecbf367e3159d9d5 100644 (file)
--- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml
+++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml
@@ -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/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>
 
     </chapter>
   </part>
 

diff --git a/docs/libempathy-gtk/libempathy-gtk.types b/docs/libempathy-gtk/libempathy-gtk.types
index ed611c993bbf143b0ce70492de033a1ac04a4c94..5cfb7b21a40b425e8d8196605d8da664166676d0 100644 (file)
--- a/docs/libempathy-gtk/libempathy-gtk.types
+++ b/docs/libempathy-gtk/libempathy-gtk.types
@@ -22,5 +22,4 @@ empathy_theme_boxes_get_type
 empathy_theme_get_type
 empathy_theme_irc_get_type
 empathy_theme_manager_get_type
 empathy_theme_get_type
 empathy_theme_irc_get_type
 empathy_theme_manager_get_type

-ephy_spinner_get_type

 
 

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 083065f8107d3caad4af37788317dfe32b59782b..987e28f2e8d4d5f3f581f442e90ec7f53f4dcd42 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -64,7 +64,8 @@ libempathy_gtk_la_LIBADD =                    \
        $(top_builddir)/libempathy/libempathy.la
 
 libempathy_gtk_la_LDFLAGS =                \
        $(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                        \
 
 libempathy_gtk_headers =                       \
        empathy-images.h                        \

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ad259d2d33dd634aff8f838654936263e8e0d015..2594ac201699978c0b16dc2dcb1b7dd74afe1b97 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -279,7 +279,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
                              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);
 
                              G_TYPE_NONE,
                              2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
 

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 1aea4dce4dacbc4e47417c87dbe558d738c356b1..7dbc9dd871f7f70b5fa691d80ea05ae04afc30d8 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -322,7 +322,7 @@ empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
                              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);
 
                              G_TYPE_NONE,
                              3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
 

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index e543a5f1fc14fb34aebd12c80b8908fe699f87fe..dfed7bfc7a2eea6874abf4d8e28a0cd10d10f2d1 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -37,7 +37,6 @@
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-debug.h>
 #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"
 #include <libempathy/empathy-status-presets.h>
 
 #include "empathy-ui-utils.h"

diff --git a/libempathy-gtk/empathy-theme.c b/libempathy-gtk/empathy-theme.c
index c8a9a0d48c80bd423eb720207522a205434faf27..dae690b5c002c37052ee52b7f30e5861533610be 100644 (file)
--- a/libempathy-gtk/empathy-theme.c
+++ b/libempathy-gtk/empathy-theme.c
@@ -26,7 +26,6 @@
 
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>

-#include <libempathy/empathy-marshal.h>

 
 #include "empathy-chat.h"
 #include "empathy-conf.h"
 
 #include "empathy-chat.h"
 #include "empathy-conf.h"

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 3c87db37c965630f6d6780f64e705d0c434ecb85..a114ad7c88154c8b2e7ec0ac1c5d3a814f8f6c50 100644 (file)
--- 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-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
 
 
 lib_LTLIBRARIES = libempathy.la
 


@@ -49,7 +50,8 @@ libempathy_la_LIBADD =                \
        $(LIBEMPATHY_LIBS)
 
 libempathy_la_LDFLAGS =                \
        $(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                        \
 
 libempathy_headers =                           \
        empathy-avatar.h                        \


@@ -75,8 +77,7 @@ libempathy_headers =                          \
        empathy-chandler.h                      \
        empathy-filter.h                        \
        empathy-idle.h                          \
        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 =                   \
 
 libempathy_includedir = $(includedir)/libempathy/
 libempathy_include_HEADERS =                   \


@@ -84,11 +85,11 @@ libempathy_include_HEADERS =                        \
        empathy-enum-types.h
 
 %-marshal.h: %-marshal.list Makefile
        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\"" > $@ && \
 
 %-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=$@ $<
 
 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 2ebbde968ed5cfd7334c5fafba5a1eeb84197814..a91e55dc9f486cc98d10d2c51005286ff3122d41 100644 (file)
--- 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,
                              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);
 }
                              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 510e419570f58de68841fe50c1ecb3ce156dd181..c34dc533491fa76df4e9d583023baa8a0b81223c 100644 (file)
--- 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,
                              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);
                              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,
                              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);
                              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,
                              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);
 
                              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 700f9819b030e6ea34ddd3e0d721fa3de2f8f1c7..fb8a5208eb8913eaa2ce236bbcdeea433d968d73 100644 (file)
--- 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,
                              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);
 
                              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,
                              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);
 
                              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 7a7f8dfecbaf62a8ef5f7b9134b2638075c01079..5e166cac9d33163e74719e73ed99babab46d10e0 100644 (file)
--- 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,
                              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);
 
                              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,
                              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);
 
                              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 30a0097c6ccad55bfd535feed8bf7186eeb0d9c1..c20bf205347ecfec004156adcd34a3bfcf3dc72d 100644 (file)
--- 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,
                              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);
 
                              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,
                              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);
 
                              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,
                              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);
 
                              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,
                              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);
 
                              G_TYPE_NONE,
                              4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING);