[Telepathy-commits] [telepathy-gabble/master] gabble_private_tubes_factory_caps_diff: simplify pointer comparaisons

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Feb 2 07:32:10 PST 2009


---
 src/private-tubes-factory.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index cb0afa1..798620e 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -814,11 +814,10 @@ gabble_private_tubes_factory_caps_diff (
   TubesCapabilities *old_caps = specific_old_caps;
   TubesCapabilities *new_caps = specific_new_caps;
 
-  if (old_caps == NULL && new_caps == NULL)
+  if (old_caps == new_caps)
     return FALSE;
 
-  /* At most one of the caps is NULL at this point */
-  if (old_caps == new_caps || old_caps == NULL || new_caps == NULL)
+  if (old_caps == NULL || new_caps == NULL)
     return TRUE;
 
   if (old_caps->tubes_supported != new_caps->tubes_supported)
-- 
1.5.6.5




More information about the Telepathy-commits mailing list