[telepathy-gabble/telepathy-gabble-0.8] Implement undrafted InitialAudio/Video

[Will Thompson]

We'll preserve support for these properties on StreamedMedia.FUTURE for
the lifetime of 0.8, in case people are depending on them, but they can
go away in 0.9.
---
 src/media-channel.c        |    4 ++++
 src/media-factory.c        |   10 ++++++++--
 tests/twisted/constants.py |    4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/media-channel.c b/src/media-channel.c
index 760c2d2..06a5c75 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -547,6 +547,8 @@ gabble_media_channel_get_property (GObject    *object,
               TP_IFACE_CHANNEL, "Requested",
               TP_IFACE_CHANNEL, "Interfaces",
               TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, "ImmutableStreams",
+              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));
@@ -686,6 +688,8 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
   };
   static TpDBusPropertiesMixinPropImpl streamed_media_props[] = {
       { "ImmutableStreams", "immutable-streams", NULL },
+      { "InitialAudio", "initial-audio", NULL },
+      { "InitialVideo", "initial-video", NULL },
       { NULL }
   };
   static TpDBusPropertiesMixinPropImpl streamed_media_future_props[] = {
diff --git a/src/media-factory.c b/src/media-factory.c
index 5171184..666a0b6 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -374,6 +374,8 @@ static const gchar * const media_channel_fixed_properties[] = {
 static const gchar * const named_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetHandle",
     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
@@ -530,9 +532,13 @@ gabble_media_factory_requestotron (TpChannelManager *manager,
       TP_IFACE_CHANNEL ".TargetHandle", NULL);
 
   initial_audio = tp_asv_get_boolean (request_properties,
-      GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialAudio", NULL);
+        TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", NULL) ||
+      tp_asv_get_boolean (request_properties,
+        GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialAudio", NULL);
   initial_video = tp_asv_get_boolean (request_properties,
-      GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialVideo", NULL);
+        TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL) ||
+      tp_asv_get_boolean (request_properties,
+        GABBLE_IFACE_CHANNEL_TYPE_STREAMED_MEDIA_FUTURE ".InitialVideo", NULL);
 
   switch (handle_type)
     {
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 48c21e8..1014e92 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -44,8 +44,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'
-- 
1.5.6.5