diff options
| author | Olivier Crete <olivier.crete@collabora.co.uk> | 2008-07-21 22:52:58 +0000 |
|---|---|---|
| committer | Olivier Crete <olivier.crete@collabora.co.uk> | 2008-07-21 22:52:58 +0000 |
| commit | 68dfe56549b92382fd22af9d721abec50fb4e3cb (patch) | |
| tree | 46f4d133bff90b9a5a5a633c9c83417758fc25ab | |
| parent | 1666637593a3b3ffd1f6deb0e4c6c069f2507f3d (diff) | |
Remove the session from the public api and the docs
| -rw-r--r-- | doc/lib/Makefile.am | 6 | ||||
| -rw-r--r-- | doc/lib/lib-sections.txt | 34 | ||||
| -rw-r--r-- | lib/Makefile.am | 10 | ||||
| -rw-r--r-- | lib/channel.c | 2 |
4 files changed, 9 insertions, 43 deletions
diff --git a/doc/lib/Makefile.am b/doc/lib/Makefile.am index 8a86bdc..1389bbb 100644 --- a/doc/lib/Makefile.am +++ b/doc/lib/Makefile.am @@ -44,12 +44,12 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/lib/*.h -CFILE_GLOB=$(top_srcdir)/lib/*.c +HFILE_GLOB=$(top_srcdir)/lib/channel.h $(top_srcdir)/lib/stream.h +CFILE_GLOB=$(top_srcdir)/lib/channel.c $(top_srcdir)/lib/stream.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=*-priv.h *marshal.h +IGNORE_HFILES=*-priv.h *marshal.h session.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/doc/lib/lib-sections.txt b/doc/lib/lib-sections.txt index 3615440..1edefb5 100644 --- a/doc/lib/lib-sections.txt +++ b/doc/lib/lib-sections.txt @@ -40,37 +40,3 @@ TPMEDIA_CHANNEL_CLASS TP_STREAM_ENGINE_IS_CHANNEL_CLASS TPMEDIA_CHANNEL_GET_CLASS </SECTION> - -<SECTION> -<FILE>session</FILE> -<TITLE>TpmediaSession</TITLE> -TpmediaSession -TpmediaSessionClass -<SUBSECTION Private> -TpmediaSessionPrivate -<SUBSECTION Standard> -TPMEDIA_SESSION -TP_STREAM_ENGINE_IS_SESSION -TPMEDIA_TYPE_SESSION -tpmedia_session_get_type -TPMEDIA_SESSION_CLASS -TP_STREAM_ENGINE_IS_SESSION_CLASS -TPMEDIA_SESSION_GET_CLASS -</SECTION> - -<SECTION> -<FILE>tpmedia-signals-marshal</FILE> -</SECTION> - -<SECTION> -<FILE>tp-stream-engine-signals-marshal</FILE> -</SECTION> - -<SECTION> -<FILE>session-priv</FILE> -</SECTION> - -<SECTION> -<FILE>stream-priv</FILE> -</SECTION> - diff --git a/lib/Makefile.am b/lib/Makefile.am index 1b5e6ad..4a09f71 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,12 +5,12 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) libstreamengine_la_SOURCES = \ - channel.c \ - channel.h \ + stream.c \ + stream.h \ session.c \ session.h \ - stream.c \ - stream.h + channel.c \ + channel.h nodist_libstreamengine_la_SOURCES = $(BUILT_SOURCES) @@ -37,7 +37,7 @@ libstreamengine_la_LIBADD = \ $(FARSIGHT2_LIBS) \ $(TELEPATHY_LIBS) -libstreamengine_la_LDFLAGS = -no-undefined -export-symbols-regex "^tpmedia_.*" +libstreamengine_la_LDFLAGS = -no-undefined -export-symbols-regex "^tpmedia_(channel|stream).*" # rules to generate signal marshallers %-signals-marshal.h: %-signals-marshal.list Makefile.in diff --git a/lib/channel.c b/lib/channel.c index 1ac6b42..e519916 100644 --- a/lib/channel.c +++ b/lib/channel.c @@ -727,7 +727,7 @@ add_session (TpmediaChannel *self, return; } - session = _tpmedia_session_new (proxy, session_type, &error); + session = tpmedia_session_new (proxy, session_type, &error); if (session == NULL) { |