summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2010-12-01 19:16:39 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2010-12-01 19:16:39 +0000
commit6280638d071aebceae251f6cf519b4f7eb94133e (patch)
treef60f60a79a4428ee2a668c4d0738120b3e814642
parentbf8504c35f8771b6a5537e00fd644ba40dfa176a (diff)
CapsCache: remove an unneeded assertion.blow-away-corrupt-caps-caches
If caps_cache_open() returns TRUE but self->priv->db is NULL, the worst that happens is that we don't use a caps cache this session. Besides, by inspection that will never happen, except if sqlite3_open is broken, in which case we're dead a long time ago.
-rw-r--r--src/caps-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/caps-cache.c b/src/caps-cache.c
index d6dc6ec5a..bf2847fa4 100644
--- a/src/caps-cache.c
+++ b/src/caps-cache.c
@@ -275,8 +275,8 @@ nuke_it_and_try_again (GabbleCapsCache *self)
if (ret != 0)
DEBUG ("removing database failed: %s", g_strerror (errno));
- else if (caps_cache_open (self))
- g_assert (self->priv->db != NULL);
+ else
+ caps_cache_open (self);
}
static void