[Telepathy-commits] [telepathy-salut/master] salut_tubes_manager_caps_diff: check pointer equality first
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Thu Feb 26 11:20:29 PST 2009
---
src/salut-tubes-manager.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 6c2b8a8..a0e075d 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -1395,11 +1395,10 @@ salut_tubes_manager_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 (g_hash_table_size (old_caps->stream_tube_caps) !=
--
1.5.6.5
More information about the telepathy-commits
mailing list