[telepathy-salut/master] salut_ft_manager_parse_caps: say that FT capa is unknown if there is no capa announced
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Wed Apr 1 04:10:43 PDT 2009
---
src/salut-ft-manager.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index e08ff50..5c0b476 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -652,7 +652,7 @@ salut_ft_manager_get_contact_caps (SalutCapsChannelManager *manager,
caps = GPOINTER_TO_UINT (g_hash_table_lookup (
contact->per_channel_manager_caps, manager));
- if (caps != FT_CAPA_SUPPORTED)
+ if (caps == FT_CAPA_UNSUPPORTED)
return;
/* FT is supported */
@@ -691,6 +691,9 @@ salut_ft_manager_parse_caps (SalutCapsChannelManager *manager,
gboolean support_ft = FALSE;
FtCapaStatus caps;
+ if (node == NULL)
+ return FT_CAPA_UNKNOWN;
+
gibber_xmpp_node_each_child (node, _parse_caps_item, &support_ft);
if (support_ft)
--
1.5.6.5
More information about the telepathy-commits
mailing list