diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-07 15:18:23 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-11 11:20:56 +0100 |
| commit | fbfa8c138da1a4f00c74af4bda98e858a203a58b (patch) | |
| tree | 2837a5b5ae7aceddba23291eb0014efa0349979d /gabble | |
| parent | 1866bc54eecf2fa6ce00b37d196cd904f8a0203b (diff) | |
Add Google camera-v1 as a first-class caps bundle
This is partly a point of principle - given any caps bundle that we have
ever advertised support for, we should be prepared to define when asked -
but mainly a workaround for the iChat bug mentioned in commit af55ea3d.
If we return an error, it will keep disco'ing us repeatedly in a loop.
This leaves us with the problem of finding out what the bundle contains.
In Google's usage it is only its name that is important (ignoring that
XEP-0115 explicitly makes bundle names opaque), but replying to disco
requests for it requires us to be able to turn it into a set of 0 or
more capability URIs. Because of the Google server bug mentioned in
commit cd0da0a8, we can't just ask a Google client, because they're
all on Google servers, so they can't usefully be disco'd.
We assume here that it behaves like the voice-v1 and video-v1 bundles
in containing exactly one URI, and that that URI corresponds to the
bundle name in the same way.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54634
Diffstat (limited to 'gabble')
| -rw-r--r-- | gabble/capabilities.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gabble/capabilities.h b/gabble/capabilities.h index 81c8c2546..dd0a0c901 100644 --- a/gabble/capabilities.h +++ b/gabble/capabilities.h @@ -65,6 +65,7 @@ const GabbleCapabilitySet *gabble_capabilities_get_olpc_notify (void); const GabbleCapabilitySet *gabble_capabilities_get_bundle_share_v1 (void); const GabbleCapabilitySet *gabble_capabilities_get_bundle_voice_v1 (void); const GabbleCapabilitySet *gabble_capabilities_get_bundle_video_v1 (void); +const GabbleCapabilitySet *gabble_capabilities_get_bundle_camera_v1 (void); /* Return the capabilities we always have */ const GabbleCapabilitySet *gabble_capabilities_get_fixed_caps (void); |