diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-21 20:19:00 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-21 20:19:00 +0800 |
| commit | 91085fbd03668468fa598e59e536c751478a57f5 (patch) | |
| tree | 4966d0b812a824b407b1756cf9e35285369742fc /libempathy | |
| parent | 44b337df1962dbcda7b8de161444735570d38972 (diff) | |
| parent | 6a401905c9f98fcf821383012e71f9ea8abe0bc3 (diff) | |
| download | gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.tar gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.tar.gz gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.tar.bz2 gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.tar.lz gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.tar.xz gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.tar.zst gsoc2013-empathy-91085fbd03668468fa598e59e536c751478a57f5.zip | |
Merge branch 'check-vinagre-589225'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact.c | 12 | ||||
| -rw-r--r-- | libempathy/empathy-contact.h | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index cbd3bd0ae..ba695ca57 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -970,7 +970,7 @@ empathy_contact_can_send_files (EmpathyContact *contact) } gboolean -empathy_contact_can_use_stream_tube (EmpathyContact *contact) +empathy_contact_can_use_rfb_stream_tube (EmpathyContact *contact) { EmpathyContactPriv *priv; @@ -978,7 +978,7 @@ empathy_contact_can_use_stream_tube (EmpathyContact *contact) priv = GET_PRIV (contact); - return priv->capabilities & EMPATHY_CAPABILITIES_STREAM_TUBE; + return priv->capabilities & EMPATHY_CAPABILITIES_RFB_STREAM_TUBE; } static gchar * @@ -1448,7 +1448,13 @@ tp_caps_to_capabilities (TpCapabilities *caps) } else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE)) { - capabilities |= EMPATHY_CAPABILITIES_STREAM_TUBE; + const gchar *service; + + service = tp_asv_get_string (fixed_prop, + TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE); + + if (!tp_strdiff (service, "rfb")) + capabilities |= EMPATHY_CAPABILITIES_RFB_STREAM_TUBE; } else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index ddb3f66c0..b5f24d0c5 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -65,7 +65,7 @@ typedef enum { EMPATHY_CAPABILITIES_AUDIO = 1 << 0, EMPATHY_CAPABILITIES_VIDEO = 1 << 1, EMPATHY_CAPABILITIES_FT = 1 << 2, - EMPATHY_CAPABILITIES_STREAM_TUBE = 1 << 3, + EMPATHY_CAPABILITIES_RFB_STREAM_TUBE = 1 << 3, EMPATHY_CAPABILITIES_UNKNOWN = 1 << 7 } EmpathyCapabilities; @@ -106,7 +106,7 @@ gboolean empathy_contact_can_voip (EmpathyContact *contact); gboolean empathy_contact_can_voip_audio (EmpathyContact *contact); gboolean empathy_contact_can_voip_video (EmpathyContact *contact); gboolean empathy_contact_can_send_files (EmpathyContact *contact); -gboolean empathy_contact_can_use_stream_tube (EmpathyContact *contact); +gboolean empathy_contact_can_use_rfb_stream_tube (EmpathyContact *contact); gboolean empathy_contact_load_avatar_cache (EmpathyContact *contact, const gchar *token); |