[Telepathy-commits] [telepathy-salut/master] salut_tubes_manager_caps_diff: return FALSE if both caps are NULL

[Guillaume Desmottes]

---
 src/salut-tubes-manager.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index e534229..7293482 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -1397,11 +1397,11 @@ salut_tubes_manager_caps_diff (
   TubesCapabilities *old_caps = specific_old_caps;
   TubesCapabilities *new_caps = specific_new_caps;
 
-  if (new_caps == NULL && old_caps != NULL)
-    return TRUE;
-  else if (old_caps == NULL && new_caps != NULL)
-    return TRUE;
-  else if (old_caps == NULL && new_caps == NULL)
+  if (old_caps == NULL && new_caps == NULL)
+    return FALSE;
+
+  /* At most one of the caps is NULL at this point */
+  if (old_caps == new_caps || old_caps == NULL || new_caps == NULL)
     return TRUE;
 
   if (!hash_table_is_subset (new_caps->stream_tube_caps,
-- 
1.5.6.5