[telepathy-salut/master] ft-manager: drop FT_CAPA_UNKNOWN and use FT_CAPA_SUPPORTED instead
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Wed Apr 1 10:19:31 PDT 2009
FT_CAPA_UNKNOWN had a value of 0 which appeared as 'NULL' in the
caps-channel-manager. This is misleading and the change in the contact
capabilities is not detected as NULL is supposed to be used when there
is no capability.
---
src/salut-ft-manager.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index 73df616..c69e628 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -51,8 +51,7 @@ static void salut_ft_manager_channel_created (SalutFtManager *mgr,
typedef enum
{
- FT_CAPA_UNKNOWN = 0,
- FT_CAPA_SUPPORTED,
+ FT_CAPA_SUPPORTED = 1,
FT_CAPA_UNSUPPORTED,
} FtCapaStatus;
@@ -638,7 +637,9 @@ salut_ft_manager_parse_caps (SalutCapsChannelManager *manager,
FtCapaStatus caps;
if (node == NULL)
- return FT_CAPA_UNKNOWN;
+ /* If we don't receive any capabilities info we assumed FT is supported
+ * to ensure interoperability with other clients */
+ return GUINT_TO_POINTER (FT_CAPA_SUPPORTED);
gibber_xmpp_node_each_child (node, _parse_caps_item, &support_ft);
--
1.5.6.5
More information about the telepathy-commits
mailing list