[telepathy-gabble/master] Depend on telepathy-glib 0.7.37 and implement the final version of InitialAudio/InitialVideo
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Sep 14 12:17:05 PDT 2009
---
configure.ac | 2 +-
src/media-channel.c | 8 +++-----
src/media-factory.c | 18 ++----------------
tests/twisted/constants.py | 4 ++--
tests/twisted/jingle/initial-audio-video.py | 10 ++++------
5 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac
index ec059cd..8d9082f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.78])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.35])
+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.37])
AC_SUBST(TP_GLIB_CFLAGS)
AC_SUBST(TP_GLIB_LIBS)
diff --git a/src/media-channel.c b/src/media-channel.c
index ef028db..ad3a9e1 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -71,8 +71,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleMediaChannel, gabble_media_channel,
media_signalling_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_STREAMED_MEDIA,
streamed_media_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE,
- NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROPERTIES_INTERFACE,
tp_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
@@ -518,8 +516,8 @@ gabble_media_channel_get_property (GObject *object,
TP_IFACE_CHANNEL, "InitiatorID",
TP_IFACE_CHANNEL, "Requested",
TP_IFACE_CHANNEL, "Interfaces",
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE, "InitialAudio",
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE, "InitialVideo",
+ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, "InitialAudio",
+ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, "InitialVideo",
NULL));
break;
case PROP_SESSION:
@@ -663,7 +661,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
NULL,
channel_props,
},
- { GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE,
+ { TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
tp_dbus_properties_mixin_getter_gobject_properties,
NULL,
streamed_media_props,
diff --git a/src/media-factory.c b/src/media-factory.c
index 30738c5..5b5e635 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -380,8 +380,6 @@ static const gchar * const named_channel_allowed_properties[] = {
TP_IFACE_CHANNEL ".TargetID",
TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio",
TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo",
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialAudio",
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialVideo",
NULL
};
@@ -392,7 +390,6 @@ static const gchar * const * video_allowed =
static const gchar * const audio_allowed[] = {
TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio",
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialAudio",
NULL
};
@@ -558,11 +555,6 @@ gabble_media_factory_requestotron (TpChannelManager *manager,
initial_video = tp_asv_get_boolean (request_properties,
TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL);
- initial_audio = initial_audio || tp_asv_get_boolean (request_properties,
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialAudio", NULL);
- initial_video = initial_video || tp_asv_get_boolean (request_properties,
- GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialVideo", NULL);
-
switch (handle_type)
{
case TP_HANDLE_TYPE_NONE:
@@ -907,18 +899,12 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
continue;
}
- /* for now, accept either the current InitialAudio (which is in
- * the FUTURE) or the hypothetical final version */
if (tp_asv_get_boolean (filter,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", NULL) ||
- tp_asv_get_boolean (filter,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".FUTURE.InitialAudio", NULL))
+ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", NULL))
audio = TRUE;
if (tp_asv_get_boolean (filter,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL) ||
- tp_asv_get_boolean (filter,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".FUTURE.InitialVideo", NULL))
+ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL))
video = TRUE;
/* If we've picked up all the capabilities we're ever going to, then
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 0fde466..e47501f 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -45,8 +45,8 @@ INITIATOR_HANDLE = CHANNEL + '.InitiatorHandle'
INITIATOR_ID = CHANNEL + '.InitiatorID'
INTERFACES = CHANNEL + '.Interfaces'
-INITIAL_AUDIO = CHANNEL_TYPE_STREAMED_MEDIA + '.FUTURE.InitialAudio'
-INITIAL_VIDEO = CHANNEL_TYPE_STREAMED_MEDIA + '.FUTURE.InitialVideo'
+INITIAL_AUDIO = CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio'
+INITIAL_VIDEO = CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo'
CONN = "org.freedesktop.Telepathy.Connection"
CONN_IFACE_AVATARS = CONN + '.Interface.Avatars'
diff --git a/tests/twisted/jingle/initial-audio-video.py b/tests/twisted/jingle/initial-audio-video.py
index bf6f4a8..6f09ff8 100644
--- a/tests/twisted/jingle/initial-audio-video.py
+++ b/tests/twisted/jingle/initial-audio-video.py
@@ -32,8 +32,6 @@ def outgoing(jp, q, bus, conn, stream):
fixed, allowed = media_classes[0]
assertContains(cs.INITIAL_AUDIO, allowed)
assertContains(cs.INITIAL_VIDEO, allowed)
- assertContains(cs.INITIAL_AUDIO.replace('.FUTURE.', '.'), allowed)
- assertContains(cs.INITIAL_VIDEO.replace('.FUTURE.', '.'), allowed)
check_neither(q, conn, bus, stream, remote_handle)
check_iav(jt, q, conn, bus, stream, remote_handle, True, False)
@@ -57,7 +55,7 @@ def check_neither(q, conn, bus, stream, remote_handle):
chan = wrap_channel(bus.get_object(conn.bus_name, path),
cs.CHANNEL_TYPE_STREAMED_MEDIA, ['MediaSignalling'])
- props = chan.Properties.GetAll(cs.CHANNEL_TYPE_STREAMED_MEDIA + '.FUTURE')
+ props = chan.Properties.GetAll(cs.CHANNEL_TYPE_STREAMED_MEDIA)
assertContains(('InitialAudio', False), props.items())
assertContains(('InitialVideo', False), props.items())
@@ -78,8 +76,8 @@ def check_iav(jt, q, conn, bus, stream, remote_handle, initial_audio,
cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAMED_MEDIA,
cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
cs.TARGET_HANDLE: remote_handle,
- cs.INITIAL_AUDIO.replace('.FUTURE.', '.'): initial_audio,
- cs.INITIAL_VIDEO.replace('.FUTURE.', '.'): initial_video,
+ cs.INITIAL_AUDIO: initial_audio,
+ cs.INITIAL_VIDEO: initial_video,
})
if initial_video and (not jt.jp.can_do_video()
or (not initial_audio and not jt.jp.can_do_video_only ())):
@@ -94,7 +92,7 @@ def check_iav(jt, q, conn, bus, stream, remote_handle, initial_audio,
chan = wrap_channel(bus.get_object(conn.bus_name, path),
cs.CHANNEL_TYPE_STREAMED_MEDIA, ['MediaSignalling'])
- props = chan.Properties.GetAll(cs.CHANNEL_TYPE_STREAMED_MEDIA + '.FUTURE')
+ props = chan.Properties.GetAll(cs.CHANNEL_TYPE_STREAMED_MEDIA)
assertContains(('InitialAudio', initial_audio), props.items())
assertContains(('InitialVideo', initial_video), props.items())
--
1.5.6.5
More information about the telepathy-commits
mailing list