From 15b3e5e0172f7e0c961a7b8618c5e8758ab729d5 Mon Sep 17 00:00:00 2001 From: Mikhail Zabaluev Date: Fri, 7 Mar 2008 16:07:22 +0000 Subject: Renamed extensions subdirectory into tpsip-extensions 20080307160722-5b6ca-75b2d2b88b26231bc9871c52fe7d0f17ad812e42.gz --- extensions/.git-darcs-dir | 0 extensions/Channel_Interface_Call_State.xml | 99 -------------------- extensions/Channel_Interface_Hold.xml | 129 -------------------------- extensions/Makefile.am | 134 ---------------------------- extensions/all.xml | 14 --- extensions/channel.xml | 10 --- extensions/extensions-cli.c | 19 ---- extensions/extensions.c | 6 -- extensions/extensions.h | 20 ----- 9 files changed, 431 deletions(-) delete mode 100644 extensions/.git-darcs-dir delete mode 100644 extensions/Channel_Interface_Call_State.xml delete mode 100644 extensions/Channel_Interface_Hold.xml delete mode 100644 extensions/Makefile.am delete mode 100644 extensions/all.xml delete mode 100644 extensions/channel.xml delete mode 100644 extensions/extensions-cli.c delete mode 100644 extensions/extensions.c delete mode 100644 extensions/extensions.h (limited to 'extensions') diff --git a/extensions/.git-darcs-dir b/extensions/.git-darcs-dir deleted file mode 100644 index e69de29..0000000 diff --git a/extensions/Channel_Interface_Call_State.xml b/extensions/Channel_Interface_Call_State.xml deleted file mode 100644 index b0faa42..0000000 --- a/extensions/Channel_Interface_Call_State.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - Copyright (C) 2008 Collabora Limited - Copyright (C) 2008 Nokia Corporation - -

This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version.

- -

This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - - - - - An interface for streamed media channels that can indicate call - progress or call states. The presence of this interface is no guarantee - that call states will actually be signalled (for instance, SIP - implementations are not guaranteed to generate status 180 Ringing, - so a call can be accepted without the Ringing flag ever having been set). - - - - - Get the current call states for all contacts involved in this call. - - - - - The current call states. Participants where the call state flags - would be 0 (all unset) may be omitted from this mapping. - - - - - - - Emitted when the state of a member of the channel has changed. - - - - - An integer handle for the contact. - - - - - - The new state for this contact. - - - - - - - A map from contacts to call states. - - - - A contact involved in this call. - - - - State flags for the given contact. - - - - - - A set of flags representing call states. - - - - - The contact has been alerted about the call but has not responded - (e.g. 180 Ringing in SIP). - - - - - - The contact is temporarily unavailable, and the call has been placed - in a queue (e.g. 182 Queued in SIP, or call-waiting in telephony). - - - - - - - diff --git a/extensions/Channel_Interface_Hold.xml b/extensions/Channel_Interface_Hold.xml deleted file mode 100644 index 6e04ffb..0000000 --- a/extensions/Channel_Interface_Hold.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - Copyright (C) 2005-2008 Collabora Limited - Copyright (C) 2005-2008 Nokia Corporation - Copyright (C) 2006 INdT - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - - -

Interface for channels where you or other members may put - the channel on hold. This only makes sense for channels where - you are streaming media to or from the members.

- -

If you are placed on hold, this indicates that some or all members - of the channel will no longer be receiving media streams from you. - If the channel has the MediaSignalling interface, client applications - should stop sending media to all members of the channel.

- -

Depending on the protocol, it might not be possible to tell that - you're on hold, in which case the connection manager should always - indicate that you're not on hold unless it finds out otherwise.

- -

If you place a channel on hold, this indicates that you do not wish - to be sent media streams by any of its members and will be ignoring - any media streams you continue to receive. It also requests that the - connection manager free up any resources that are only needed for - an actively used channel (e.g. in a GSM or PBX call, it will be - necessary to place an active call on hold before you can start - another call).

- - - - - The possible hold states of a call. - - - - Neither the local user nor a remote member have placed the call on - hold. - - - - - The local user has put the call on hold. - - - - - The call has been put on hold by a remote member. - - - - - The local user and a remote member have both placed the call - on hold. - - - - - - - - The channel's current hold state - - - - Return the channel's current hold state. - - - - - - - An integer representing the new hold state - - - - Emitted to indicate that the hold state has changed for this channel. - This may occur as a consequence of you requesting a change with - RequestHold, or the state changing as a result of a request from a - remote member or another process. - - - - - - - A boolean indicating whether or not the channel should be on hold - - - - Request that the channel be put on hold (be instructed not to send - any media streams to you) or be taken off hold. Success is indicated - by the HoldStateChanged signal being emitted and by a successful - return from this method. - - - - - - - The requested hold state cannot be achieved; for example, - if only a limited number of channels can be in the "not on hold" - state, attempts to exceed this number will raise NotAvailable. - - - - - - - - diff --git a/extensions/Makefile.am b/extensions/Makefile.am deleted file mode 100644 index 355d759..0000000 --- a/extensions/Makefile.am +++ /dev/null @@ -1,134 +0,0 @@ -tools_dir = $(top_srcdir)/tools - -AM_CFLAGS = \ - $(ERROR_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(TELEPATHY_GLIB_CFLAGS) - -EXTRA_DIST = \ - all.xml \ - channel.xml \ - Channel_Interface_Call_State.xml \ - Channel_Interface_Hold.xml - -noinst_LTLIBRARIES = libtpsip-extensions.la - -libtpsip_extensions_la_LIBADD = \ - $(TELEPATHY_GLIB_LIBS) - -# The client-specific parts are built into a separate .o file, so the linker -# can discard them when linking services. The service-specific parts are -# in svc-*.c, so we don't need an extensions-svc.c. -libsip_extensions_la_SOURCES = \ - extensions.c \ - extensions-cli.c \ - extensions.h - -nodist_libtpsip_extensions_la_SOURCES = \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ - _gen/register-dbus-glib-marshallers-body.h \ - _gen/enums.h \ - _gen/gtypes.h \ - _gen/gtypes-body.h \ - _gen/interfaces.h \ - _gen/interfaces-body.h \ - _gen/cli-channel.h \ - _gen/cli-channel-body.h \ - _gen/svc-channel.h \ - _gen/svc-channel.c - -BUILT_SOURCES = \ - _gen/all.xml \ - _gen/channel.xml \ - $(nodist_libtpsip_extensions_la_SOURCES) \ - extensions.html - -CLEANFILES = $(BUILT_SOURCES) - -XSLTPROCFLAGS = --nonet --novalid - -# Generated files which can be generated for all categories simultaneously - -_gen/all.xml: all.xml $(wildcard *.xml) - $(mkdir_p) _gen - $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - -extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) \ - $(tools_dir)/doc-generator.xsl \ - $< > $@ - -_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ - $(top_srcdir)/tools/glib-gtypes-generator.py - $(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ - $< _gen/gtypes TPSIP - -_gen/signals-marshal.list: _gen/all.xml \ - $(tools_dir)/glib-signals-marshal-gen.py - $(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list - $(GLIB_GENMARSHAL) --header --prefix=_tpsip_ext_marshal $< > $@ - -_gen/signals-marshal.c: _gen/signals-marshal.list - $(GLIB_GENMARSHAL) --body --prefix=_tpsip_ext_marshal $< > $@ - -_gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ - $(tools_dir)/glib-client-marshaller-gen.py - $(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ - _tpsip_ext > $@ - -_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam mixed-case-prefix Tpsip \ - $(tools_dir)/c-constants-generator.xsl \ - $< > $@ - -_gen/interfaces.h: _gen/all.xml \ - $(tools_dir)/glib-interfaces-generator.xsl \ - $(tools_dir)/c-interfaces-generator.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam mixed-case-prefix Tpsip \ - $(tools_dir)/glib-interfaces-generator.xsl \ - $< > $@ - -_gen/interfaces-body.h: _gen/all.xml \ - $(tools_dir)/glib-interfaces-body-generator.xsl \ - $(tools_dir)/c-interfaces-generator.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam mixed-case-prefix Tpsip \ - $(tools_dir)/glib-interfaces-body-generator.xsl \ - $< > $@ - -# Generated files which must be generated per "category". Each TpProxy -# subclass you want to use with --subclass will need to have its own category, -# although you can subdivide further if you want. - -_gen/channel.xml: channel.xml $(wildcard *.xml) - $(mkdir_p) _gen - $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - -_gen/cli-channel-body.h _gen/cli-channel.h: _gen/channel.xml \ - $(tools_dir)/glib-client-gen.py - $(PYTHON) $(tools_dir)/glib-client-gen.py \ - --group=channel \ - --subclass=TpChannel \ - --subclass-assert=TP_IS_CHANNEL \ - --iface-quark-prefix=TPSIP_IFACE_QUARK \ - $< Tpsip_Cli _gen/cli-channel - -_gen/svc-channel.c _gen/svc-channel.h: _gen/channel.xml \ - $(tools_dir)/glib-ginterface-gen.py - $(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc-channel \ - --signal-marshal-prefix=_tpsip_ext \ - --include='' \ - --include='"_gen/signals-marshal.h"' \ - --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ - --allow-unstable \ - $< Tpsip_Svc_ diff --git a/extensions/all.xml b/extensions/all.xml deleted file mode 100644 index 0cd4295..0000000 --- a/extensions/all.xml +++ /dev/null @@ -1,14 +0,0 @@ - - -Extensions for telepathy-sofiasip - - - - - - - - diff --git a/extensions/channel.xml b/extensions/channel.xml deleted file mode 100644 index 84abb22..0000000 --- a/extensions/channel.xml +++ /dev/null @@ -1,10 +0,0 @@ - - -Channel extensions for telepathy-sofiasip - - - - - diff --git a/extensions/extensions-cli.c b/extensions/extensions-cli.c deleted file mode 100644 index 9ccd2e3..0000000 --- a/extensions/extensions-cli.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "extensions.h" - -#include -#include - -#include "_gen/signals-marshal.h" - -/* include auto-generated stubs for client-specific code */ -#include "_gen/cli-channel-body.h" -#include "_gen/register-dbus-glib-marshallers-body.h" - -void -sip_cli_init (void) -{ - _sip_ext_register_dbus_glib_marshallers (); - - tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_CHANNEL, - sip_cli_channel_add_signals); -} diff --git a/extensions/extensions.c b/extensions/extensions.c deleted file mode 100644 index eeda462..0000000 --- a/extensions/extensions.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "extensions.h" - -/* include auto-generated stubs for things common to service and client */ -#include "_gen/gtypes-body.h" -#include "_gen/interfaces-body.h" -#include "_gen/signals-marshal.h" diff --git a/extensions/extensions.h b/extensions/extensions.h deleted file mode 100644 index 242a07f..0000000 --- a/extensions/extensions.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __SIP_EXTENSIONS_H__ -#define __SIP_EXTENSIONS_H__ - -#include -#include - -#include "extensions/_gen/enums.h" -#include "extensions/_gen/cli-channel.h" -#include "extensions/_gen/svc-channel.h" - -G_BEGIN_DECLS - -#include "extensions/_gen/gtypes.h" -#include "extensions/_gen/interfaces.h" - -void sip_cli_init (void); - -G_END_DECLS - -#endif -- cgit v1.2.3