[telepathy-gabble/telepathy-gabble-0.8] vcard-manager.c: Remove redondant test on suspended_timer_id, add an assert instead

Alban Crequy alban.crequy at collabora.co.uk
Fri Sep 25 09:10:27 PDT 2009


---
 src/vcard-manager.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 0d85d8c..4f832b2 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -416,12 +416,9 @@ cache_entry_attempt_to_free (GabbleVCardCacheEntry *entry)
       return;
     }
 
-  if (entry->suspended_timer_id != 0)
-    {
-      DEBUG ("Not freeing vCard cache entry %p: it has suspended requests",
-          entry);
-      return;
-    }
+  /* If there is a suspended request, it must be in entry-> pending_requests
+   */
+  g_assert (entry->suspended_timer_id == 0);
 
   if (entry->handle == base->self_handle)
     {
-- 
1.5.6.5




More information about the telepathy-commits mailing list