diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-17 17:54:53 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-17 17:54:53 +0100 |
| commit | 92814a55d012c3a6cd5111486f3505ceb6f31984 (patch) | |
| tree | f2f78d14b5384e54a1737077d9ead2c9db654f4a /tests/twisted/constants.py | |
| parent | 979e89eeb362e467068d9f1ce3b7f9669ae7da7c (diff) | |
| parent | 254a277868df1adb1b1db62f43a3c19944f3bf80 (diff) | |
| download | telepathy-haze-92814a55d012c3a6cd5111486f3505ceb6f31984.tar.gz | |
Merge branch 'telepathy-haze-0.8'
Conflicts:
NEWS
Diffstat (limited to 'tests/twisted/constants.py')
| -rw-r--r-- | tests/twisted/constants.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py index d541c75..37d6d52 100644 --- a/tests/twisted/constants.py +++ b/tests/twisted/constants.py @@ -195,6 +195,7 @@ CONN_IFACE_CONTACT_BLOCKING = CONN + '.Interface.ContactBlocking' CONN_IFACE_ADDRESSING = CONN + '.Interface.Addressing1' ATTR_CONTACT_CAPABILITIES = CONN_IFACE_CONTACT_CAPS + '/capabilities' +ATTR_PRESENCE = CONN_IFACE_SIMPLE_PRESENCE + '/presence' STREAM_HANDLER = 'org.freedesktop.Telepathy.Media.StreamHandler' |