[next] telepathy-glib: base-call-channel: DTMF interface has been merged into Call1
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Wed Jan 29 03:02:20 PST 2014
Module: telepathy-glib
Branch: next
Commit: 0ca051ac8dfcaccdf1722ecbeee46ab0714f4056
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=0ca051ac8dfcaccdf1722ecbeee46ab0714f4056
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Wed Jan 15 16:43:02 2014 +0100
base-call-channel: DTMF interface has been merged into Call1
---
.../telepathy-glib/telepathy-glib-sections.txt | 32 +-------------------
telepathy-glib/base-call-channel.c | 20 +-----------
telepathy-glib/base-media-call-channel.c | 1 -
3 files changed, 2 insertions(+), 51 deletions(-)
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 8a31be9..50d4273 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -613,26 +613,12 @@ TP_IS_SVC_CHANNEL_TYPE_CALL1
TP_SVC_CHANNEL_TYPE_CALL1
TP_SVC_CHANNEL_TYPE_CALL1_GET_CLASS
tp_svc_channel_type_call1_get_type
-<SUBSECTION>
-tp_svc_channel_interface_dtmf1_emit_sending_tones
-tp_svc_channel_interface_dtmf1_emit_stopped_tones
-tp_svc_channel_interface_dtmf1_emit_tones_deferred
-tp_svc_channel_interface_dtmf1_implement_multiple_tones
-tp_svc_channel_interface_dtmf1_implement_start_tone
-tp_svc_channel_interface_dtmf1_implement_stop_tone
-tp_svc_channel_interface_dtmf1_multiple_tones_impl
-tp_svc_channel_interface_dtmf1_return_from_multiple_tones
-tp_svc_channel_interface_dtmf1_return_from_start_tone
-tp_svc_channel_interface_dtmf1_return_from_stop_tone
-tp_svc_channel_interface_dtmf1_start_tone_impl
-tp_svc_channel_interface_dtmf1_stop_tone_impl
<SUBSECTION Standard>
TpSvcChannelInterfaceDTMF1
TpSvcChannelInterfaceDTMF1Class
TP_IS_SVC_CHANNEL_INTERFACE_DTMF1
TP_SVC_CHANNEL_INTERFACE_DTMF1_GET_CLASS
TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1
-tp_svc_channel_interface_dtmf1_get_type
<SUBSECTION>
tp_svc_channel_interface_hold1_emit_hold_state_changed
tp_svc_channel_interface_hold1_get_hold_state_impl
@@ -2391,8 +2377,6 @@ TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1
TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE1
TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1
TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE1
-TP_IFACE_CHANNEL_INTERFACE_DTMF1
-TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF1
TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
TP_IFACE_CHANNEL_INTERFACE_GROUP1
@@ -2578,9 +2562,6 @@ TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_HANDLES
TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_IDS
TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INVITATION_MESSAGE
TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_ORIGINAL_CHANNELS
-TP_PROP_CHANNEL_INTERFACE_DTMF1_CURRENTLY_SENDING_TONES
-TP_PROP_CHANNEL_INTERFACE_DTMF1_DEFERRED_TONES
-TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES
TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME
TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_METADATA
TP_PROP_CHANNEL_INTERFACE_GROUP1_GROUP_FLAGS
@@ -2652,6 +2633,7 @@ TP_PROP_CHANNEL_TYPE_CALL1_CONTENTS
TP_PROP_CHANNEL_TYPE_CALL1_HARDWARE_STREAMING
TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO
TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME
+TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TONES
TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TRANSPORT
TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO
TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME
@@ -3173,18 +3155,6 @@ tp_cli_channel_type_file_transfer1_signal_callback_uri_defined
<FILE>channel-media</FILE>
<TITLE>channel-media</TITLE>
<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
-tp_cli_channel_interface_dtmf1_call_start_tone
-tp_cli_channel_interface_dtmf1_call_stop_tone
-tp_cli_channel_interface_dtmf1_callback_for_start_tone
-tp_cli_channel_interface_dtmf1_callback_for_stop_tone
-tp_cli_channel_interface_dtmf1_call_multiple_tones
-tp_cli_channel_interface_dtmf1_callback_for_multiple_tones
-tp_cli_channel_interface_dtmf1_connect_to_sending_tones
-tp_cli_channel_interface_dtmf1_signal_callback_sending_tones
-tp_cli_channel_interface_dtmf1_connect_to_stopped_tones
-tp_cli_channel_interface_dtmf1_signal_callback_stopped_tones
-tp_cli_channel_interface_dtmf1_connect_to_tones_deferred
-tp_cli_channel_interface_dtmf1_signal_callback_tones_deferred
<SUBSECTION>
tp_cli_channel_interface_hold1_callback_for_get_hold_state
tp_cli_channel_interface_hold1_call_get_hold_state
diff --git a/telepathy-glib/base-call-channel.c b/telepathy-glib/base-call-channel.c
index 19464a8..c5297ed 100644
--- a/telepathy-glib/base-call-channel.c
+++ b/telepathy-glib/base-call-channel.c
@@ -121,15 +121,12 @@
#include "telepathy-glib/util.h"
static void call_iface_init (gpointer, gpointer);
-static void dtmf_iface_init (gpointer, gpointer);
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseCallChannel, tp_base_call_channel,
TP_TYPE_BASE_CHANNEL,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CALL1,
call_iface_init)
- G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1,
- dtmf_iface_init)
)
/* properties */
@@ -442,7 +439,7 @@ tp_base_call_channel_fill_immutable_properties (
TP_IFACE_CHANNEL_TYPE_CALL1, "InitialVideoName",
TP_IFACE_CHANNEL_TYPE_CALL1, "MutableContents",
TP_IFACE_CHANNEL_TYPE_CALL1, "HardwareStreaming",
- TP_IFACE_CHANNEL_INTERFACE_DTMF1, "InitialTones",
+ TP_IFACE_CHANNEL_TYPE_CALL1, "InitialTones",
NULL);
}
@@ -467,9 +464,6 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
{ "InitialAudioName", "initial-audio-name", NULL },
{ "InitialVideoName", "initial-video-name", NULL },
{ "MutableContents", "mutable-contents", NULL },
- { NULL },
- };
- static TpDBusPropertiesMixinPropImpl dtmf_props[] = {
{ "InitialTones", "initial-tones", NULL },
{ NULL },
};
@@ -714,12 +708,6 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
tp_dbus_properties_mixin_getter_gobject_properties,
NULL,
call_props);
-
- tp_dbus_properties_mixin_implement_interface (object_class,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF1,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- dtmf_props);
}
static const char *
@@ -1541,12 +1529,6 @@ call_iface_init (gpointer g_iface, gpointer iface_data)
#undef IMPLEMENT
}
-/* Interface has no methods, only has a requestable property */
-static void
-dtmf_iface_init (gpointer g_iface, gpointer iface_data)
-{
-}
-
/* Internal functions */
gboolean
diff --git a/telepathy-glib/base-media-call-channel.c b/telepathy-glib/base-media-call-channel.c
index 175cbb1..508e145 100644
--- a/telepathy-glib/base-media-call-channel.c
+++ b/telepathy-glib/base-media-call-channel.c
@@ -124,7 +124,6 @@ tp_base_media_call_channel_get_interfaces (TpBaseChannel *base)
tp_base_media_call_channel_parent_class)->get_interfaces (base);
g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD1);
- g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DTMF1);
return interfaces;
}
More information about the telepathy-commits
mailing list