[telepathy-gabble/master] vcard-manager.c: correct assertion about when priv->edits is NULL

Dafydd Harries dafydd.harries at collabora.co.uk
Wed Aug 19 09:18:50 PDT 2009


It previously didn't take into account the fact that it could be non-NULL if
there was a SET request in progress.
---
 src/vcard-manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 93e3bf2..f7d2c2b 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -407,7 +407,7 @@ cache_entry_attempt_to_free (GabbleVCardCacheEntry *entry)
     {
       /* if we do have some pending edits, we should also have
        * some pipeline items or pending requests */
-      g_assert (priv->edits == NULL);
+      g_assert (priv->edit_pipeline_item || priv->edits == NULL);
     }
 
   tp_heap_remove (priv->timed_cache, entry);
-- 
1.5.6.5




More information about the telepathy-commits mailing list