SVN commit 1006769 by gkiagia:

Remove the "FUTURE.InitialAudio" variants of the channel class lists that are exported
by the handler and the approvers. It seems that this variant is not really required.

 M  +1 -7      kcall_approver/knotifyapprover.cpp  
 M  +1 -7      kcall_handler/callhandler.cpp  
 M  +0 -5      kcall_handler/kcall_handler.client  
 M  +1 -7      systrayicon.cpp  


--- trunk/playground/network/kcall/kcall_approver/knotifyapprover.cpp #1006768:1006769
@@ -31,13 +31,7 @@
                                     QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
     class1[TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"] = QDBusVariant(Tp::HandleTypeContact);
 
-    QMap<QString, QDBusVariant> class2;
-    class2[TELEPATHY_INTERFACE_CHANNEL ".ChannelType"] =
-                                    QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
-    class2[TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"] = QDBusVariant(Tp::HandleTypeContact);
-    class2[TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA ".FUTURE.InitialAudio"] = QDBusVariant(true);
-
-    return Tp::ChannelClassList() << Tp::ChannelClass(class1) << Tp::ChannelClass(class2);
+    return Tp::ChannelClassList() << Tp::ChannelClass(class1);
 }
 
 struct KNotifyApprover::Private
--- trunk/playground/network/kcall/kcall_handler/callhandler.cpp #1006768:1006769
@@ -26,13 +26,7 @@
                                     QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
     class1[TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"] = QDBusVariant(Tp::HandleTypeContact);
 
-    QMap<QString, QDBusVariant> class2;
-    class2[TELEPATHY_INTERFACE_CHANNEL ".ChannelType"] =
-                                    QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
-    class2[TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"] = QDBusVariant(Tp::HandleTypeContact);
-    class2[TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA ".FUTURE.InitialAudio"] = QDBusVariant(true);
-
-    return Tp::ChannelClassList() << Tp::ChannelClass(class1) << Tp::ChannelClass(class2);
+    return Tp::ChannelClassList() << Tp::ChannelClass(class1);
 }
 
 CallHandler::CallHandler()
--- trunk/playground/network/kcall/kcall_handler/kcall_handler.client #1006768:1006769
@@ -4,8 +4,3 @@
 [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
 org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia
 org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia
-org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-org.freedesktop.Telepathy.Channel.Type.StreamedMedia.FUTURE.InitialAudio b=true
--- trunk/playground/network/kcall/systrayicon.cpp #1006768:1006769
@@ -30,13 +30,7 @@
                                     QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
     class1[TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"] = QDBusVariant(Tp::HandleTypeContact);
 
-    QMap<QString, QDBusVariant> class2;
-    class2[TELEPATHY_INTERFACE_CHANNEL ".ChannelType"] =
-                                    QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
-    class2[TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"] = QDBusVariant(Tp::HandleTypeContact);
-    class2[TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA ".FUTURE.InitialAudio"] = QDBusVariant(true);
-
-    return Tp::ChannelClassList() << Tp::ChannelClass(class1) << Tp::ChannelClass(class2);
+    return Tp::ChannelClassList() << Tp::ChannelClass(class1);
 }
 
 struct SystrayIcon::Private