summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-20 15:29:08 (GMT)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-20 16:35:34 (GMT)
commit78977ba7a02d5df92c94cb757168177825cb4751 (patch)
treebaa1afea9802479a833a75a9f4f39a510fc553c1
parentc99370d3e1532073f526378155bb5183a4f50a3f (diff)
downloadtelepathy-glib-78977ba7a02d5df92c94cb757168177825cb4751.tar.gz
telepathy-glib-78977ba7a02d5df92c94cb757168177825cb4751.tar.xz
Remove support for the Mute interface, not stable yet
-rw-r--r--docs/reference/telepathy-glib-sections.txt26
-rw-r--r--telepathy-glib/call-channel.c1
-rw-r--r--telepathy-glib/call-content.c1
-rw-r--r--telepathy-glib/call-misc.c30
-rw-r--r--telepathy-glib/call-misc.h2
-rw-r--r--telepathy-glib/call-mute.xml9
-rw-r--r--telepathy-glib/call-stream.c1
-rw-r--r--telepathy-glib/codegen.am5
-rw-r--r--telepathy-glib/stable-interfaces.xml1
-rw-r--r--telepathy-glib/svc-call.h1
10 files changed, 0 insertions, 77 deletions
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index fa41aea..027ac41 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -1001,19 +1001,6 @@ TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS_GET_CLASS
TP_IS_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
<SUBSECTION>
-TpSvcCallInterfaceMute
-TpSvcCallInterfaceMuteClass
-tp_svc_call_interface_mute_emit_mute_state_changed
-tp_svc_call_interface_mute_implement_request_muted
-tp_svc_call_interface_mute_request_muted_impl
-tp_svc_call_interface_mute_return_from_request_muted
-<SUBSECTION Standard>
-tp_svc_call_interface_mute_get_type
-TP_TYPE_SVC_CALL_INTERFACE_MUTE
-TP_SVC_CALL_INTERFACE_MUTE
-TP_SVC_CALL_INTERFACE_MUTE_GET_CLASS
-TP_IS_SVC_CALL_INTERFACE_MUTE
-<SUBSECTION>
TpSvcCallStream
TpSvcCallStreamClass
tp_svc_call_stream_implement_request_receiving
@@ -2914,8 +2901,6 @@ TpCallStateChangeReason
NUM_TP_CALL_STATE_CHANGE_REASONS
TpCallStreamCandidateType
NUM_TP_CALL_STREAM_CANDIDATE_TYPES
-TpLocalMuteState
-NUM_TP_LOCAL_MUTE_STATES
TpRCPTXRRTTMode
NUM_TP_RCPT_XR_RTT_MODES
TpSendingState
@@ -3125,8 +3110,6 @@ TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
-TP_IFACE_CALL_INTERFACE_MUTE
-TP_IFACE_QUARK_CALL_INTERFACE_MUTE
TP_IFACE_CALL_STREAM
TP_IFACE_QUARK_CALL_STREAM
TP_IFACE_CALL_STREAM_ENDPOINT
@@ -3204,7 +3187,6 @@ TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_SSRCS
TP_PROP_CALL_CONTENT_NAME
TP_PROP_CALL_CONTENT_STREAMS
TP_PROP_CALL_CONTENT_TYPE
-TP_PROP_CALL_INTERFACE_MUTE_LOCAL_MUTE_STATE
TP_PROP_CALL_STREAM_CAN_REQUEST_RECEIVING
TP_PROP_CALL_STREAM_ENDPOINT_CONTROLLING
TP_PROP_CALL_STREAM_ENDPOINT_ENDPOINT_STATE
@@ -3574,7 +3556,6 @@ tp_iface_quark_call_content_media_description
tp_iface_quark_call_content_media_description_interface_rtcp_extended_reports
tp_iface_quark_call_content_media_description_interface_rtcp_feedback
tp_iface_quark_call_content_media_description_interface_rtp_header_extensions
-tp_iface_quark_call_interface_mute
tp_iface_quark_call_stream
tp_iface_quark_call_stream_endpoint
tp_iface_quark_call_stream_interface_media
@@ -6780,12 +6761,6 @@ tp_call_stream_get_feature_quark_core
<FILE>cli-call-misc</FILE>
<TITLE>cli-call-misc</TITLE>
<INCLUDE>telepathy-glib/call-misc.h</INCLUDE>
-<SUBSECTION>
-tp_cli_call_interface_mute_call_request_muted
-tp_cli_call_interface_mute_callback_for_request_muted
-tp_cli_call_interface_mute_connect_to_mute_state_changed
-tp_cli_call_interface_mute_signal_callback_mute_state_changed
-<SUBSECTION>
tp_cli_call_content_media_description_call_accept
tp_cli_call_content_media_description_call_reject
tp_cli_call_content_media_description_callback_for_accept
@@ -6818,7 +6793,6 @@ tp_cli_call_stream_endpoint_signal_callback_remote_credentials_set
<TITLE>call-misc</TITLE>
<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
<SUBSECTION>
-tp_call_mute_init_known_interfaces
tp_call_content_media_description_init_known_interfaces
tp_call_stream_endpoint_init_known_interfaces
</SECTION>
diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index 4c59edd..c2a87af 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -740,7 +740,6 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
proxy_class->list_features = tp_call_channel_list_features;
g_type_class_add_private (gobject_class, sizeof (TpCallChannelPrivate));
- tp_call_mute_init_known_interfaces ();
/* FIXME: Should be annoted with
*
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
index 6e240b1..ee9586e 100644
--- a/telepathy-glib/call-content.c
+++ b/telepathy-glib/call-content.c
@@ -547,7 +547,6 @@ tp_call_content_class_init (TpCallContentClass *klass)
g_type_class_add_private (gobject_class, sizeof (TpCallContentPrivate));
tp_call_content_init_known_interfaces ();
- tp_call_mute_init_known_interfaces ();
/**
* TpCallContent:connection:
diff --git a/telepathy-glib/call-misc.c b/telepathy-glib/call-misc.c
index a8865b5..b4836c7 100644
--- a/telepathy-glib/call-misc.c
+++ b/telepathy-glib/call-misc.c
@@ -36,39 +36,9 @@
#include "telepathy-glib/proxy-subclass.h"
#include "_gen/tp-cli-call-content-media-description-body.h"
-#include "_gen/tp-cli-call-mute-body.h"
#include "_gen/tp-cli-call-stream-endpoint-body.h"
/**
- * tp_call_mute_init_known_interfaces:
- *
- * Ensure that the known interfaces for #TpProxy have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_PROXY.
- *
- * Since: 0.UNRELEASED
- */
-void
-tp_call_mute_init_known_interfaces (void)
-{
- static gsize once = 0;
-
- if (g_once_init_enter (&once))
- {
- GType tp_type = TP_TYPE_PROXY;
-
- tp_proxy_init_known_interfaces ();
- tp_proxy_or_subclass_hook_on_interface_add (tp_type,
- tp_cli_call_mute_add_signals);
-
- g_once_init_leave (&once, 1);
- }
-}
-
-/**
* tp_call_stream_endpoint_init_known_interfaces:
*
* Ensure that the known interfaces for #TpProxy have been set up.
diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h
index 1be94e5..198e045 100644
--- a/telepathy-glib/call-misc.h
+++ b/telepathy-glib/call-misc.h
@@ -25,14 +25,12 @@
G_BEGIN_DECLS
-void tp_call_mute_init_known_interfaces (void);
void tp_call_stream_endpoint_init_known_interfaces (void);
void tp_call_content_media_description_init_known_interfaces (void);
G_END_DECLS
#include "_gen/tp-cli-call-content-media-description.h"
-#include "_gen/tp-cli-call-mute.h"
#include "_gen/tp-cli-call-stream-endpoint.h"
#endif
diff --git a/telepathy-glib/call-mute.xml b/telepathy-glib/call-mute.xml
deleted file mode 100644
index 5568e1e..0000000
--- a/telepathy-glib/call-mute.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<tp:spec
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<tp:title>Call misc interfaces, version 1</tp:title>
-
-<xi:include href="../spec/Call_Interface_Mute.xml" />
-
-</tp:spec>
diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c
index 0ccbe7c..7c24356 100644
--- a/telepathy-glib/call-stream.c
+++ b/telepathy-glib/call-stream.c
@@ -333,7 +333,6 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
g_type_class_add_private (gobject_class, sizeof (TpCallStreamPrivate));
tp_call_stream_init_known_interfaces ();
- tp_call_mute_init_known_interfaces ();
/**
* TpCallStream:connection:
diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
index 166e885..c15dfc7 100644
--- a/telepathy-glib/codegen.am
+++ b/telepathy-glib/codegen.am
@@ -5,7 +5,6 @@ codegen_extra_dist = \
account-manager.xml \
call-content.xml \
call-content-media-description.xml \
- call-mute.xml \
call-stream.xml \
call-stream-endpoint.xml \
channel.xml \
@@ -47,7 +46,6 @@ nodist_geninclude_HEADERS = \
_gen/tp-cli-account-manager.h \
_gen/tp-cli-call-content.h \
_gen/tp-cli-call-content-media-description.h \
- _gen/tp-cli-call-mute.h \
_gen/tp-cli-call-stream.h \
_gen/tp-cli-call-stream-endpoint.h \
_gen/tp-cli-channel.h \
@@ -66,7 +64,6 @@ nodist_geninclude_HEADERS = \
_gen/tp-svc-account-manager.h \
_gen/tp-svc-call-content.h \
_gen/tp-svc-call-content-media-description.h \
- _gen/tp-svc-call-mute.h \
_gen/tp-svc-call-stream.h \
_gen/tp-svc-call-stream-endpoint.h \
_gen/tp-svc-channel.h \
@@ -97,7 +94,6 @@ nodist_libtelepathy_glib_internal_la_SOURCES = \
_gen/tp-cli-account-manager-body.h \
_gen/tp-cli-call-content-body.h \
_gen/tp-cli-call-content-media-description-body.h \
- _gen/tp-cli-call-mute-body.h \
_gen/tp-cli-call-stream-body.h \
_gen/tp-cli-call-stream-endpoint-body.h \
_gen/tp-cli-channel-body.h \
@@ -116,7 +112,6 @@ nodist_libtelepathy_glib_internal_la_SOURCES = \
_gen/tp-svc-account-manager.c \
_gen/tp-svc-call-content.c \
_gen/tp-svc-call-content-media-description.c \
- _gen/tp-svc-call-mute.c \
_gen/tp-svc-call-stream.c \
_gen/tp-svc-call-stream-endpoint.c \
_gen/tp-svc-channel.c \
diff --git a/telepathy-glib/stable-interfaces.xml b/telepathy-glib/stable-interfaces.xml
index a3f5b96..808c432 100644
--- a/telepathy-glib/stable-interfaces.xml
+++ b/telepathy-glib/stable-interfaces.xml
@@ -28,7 +28,6 @@
<xi:include href="call-content.xml"/>
<xi:include href="call-content-media-description.xml"/>
-<xi:include href="call-mute.xml"/>
<xi:include href="call-stream.xml"/>
<xi:include href="call-stream-endpoint.xml"/>
diff --git a/telepathy-glib/svc-call.h b/telepathy-glib/svc-call.h
index 16796d4..76cd6c7 100644
--- a/telepathy-glib/svc-call.h
+++ b/telepathy-glib/svc-call.h
@@ -3,7 +3,6 @@
#include <telepathy-glib/_gen/tp-svc-call-content.h>
#include <telepathy-glib/_gen/tp-svc-call-content-media-description.h>
-#include <telepathy-glib/_gen/tp-svc-call-mute.h>
#include <telepathy-glib/_gen/tp-svc-call-stream.h>
#include <telepathy-glib/_gen/tp-svc-call-stream-endpoint.h>