diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-04 17:54:23 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-04 17:54:23 +0800 |
| commit | c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9 (patch) | |
| tree | 216dce9e86c2c59d1404d0d7ae51403a9ed2a227 | |
| parent | dbc398f618175315db880413a0dd46984d54fbba (diff) | |
| parent | 81f57310cc5b18e5dd7a53b995068a3ed9f559f9 (diff) | |
| download | gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.tar gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.tar.gz gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.tar.bz2 gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.tar.lz gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.tar.xz gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.tar.zst gsoc2013-empathy-c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9.zip | |
Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skype
| -rw-r--r-- | data/Empathy.Call.client | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/Empathy.Call.client b/data/Empathy.Call.client index edcec3fbd..259025d86 100644 --- a/data/Empathy.Call.client +++ b/data/Empathy.Call.client @@ -8,14 +8,14 @@ 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.Call.DRAFT org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio b=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio b=true [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2] org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialVideo b=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo b=true [org.freedesktop.Telepathy.Client.Handler.Capabilities] -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp=true -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p=true -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/ice-udp=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/gtalk-p2p=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/video/h264=true |