diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-14 17:28:41 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-14 17:28:41 +0800 |
| commit | 645f4763739a3fa2fbfade2bce5a382e1e6b4a3e (patch) | |
| tree | 83bf7f440e6cfaca8e83638e8b0a92dbf3d3c8a5 | |
| parent | 9ea4b778978146d5a79a0d101d6f96b72cb9cf13 (diff) | |
| parent | 94ab9ff5f9234789b478d0068836f3fd9020e993 (diff) | |
| download | gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.tar gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.tar.gz gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.tar.bz2 gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.tar.lz gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.tar.xz gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.tar.zst gsoc2013-empathy-645f4763739a3fa2fbfade2bce5a382e1e6b4a3e.zip | |
Merge remote branch 'smcv/conference'
| -rw-r--r-- | data/Empathy.Auth.client | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/Empathy.Auth.client b/data/Empathy.Auth.client index 9b86a8b76..4c6adc0de 100644 --- a/data/Empathy.Auth.client +++ b/data/Empathy.Auth.client @@ -2,5 +2,5 @@ Interfaces=org.freedesktop.Telepathy.Client.Handler [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.DRAFT +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection org.freedesktop.Telepathy.Channel.TargetHandleType u=0 |