diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-05 16:51:21 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-05 16:51:21 +0000 |
| commit | 04e1995f37fbdc48cab3e46e5dc163c1e4dcc171 (patch) | |
| tree | b0ffb1f3ec612f2e12b5bace7adb923ee8507cfd | |
| parent | 7df2fdc8fed2c155bb45488e2dc8a0d02c28618b (diff) | |
Don't attempt to avoid avatar conflicts if disconnecting
We want to avoid calling into the vCard manager.
| -rw-r--r-- | src/presence-cache.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/presence-cache.c b/src/presence-cache.c index 021a353f0..37c8618b0 100644 --- a/src/presence-cache.c +++ b/src/presence-cache.c @@ -756,6 +756,12 @@ self_avatar_resolve_conflict (GabblePresenceCache *cache) GabblePresence *presence = priv->conn->self_presence; GError *error = NULL; + if (base_conn->status != TP_CONNECTION_STATUS_CONNECTED) + { + DEBUG ("no longer connected"); + return; + } + /* We don't want recursive image resetting * * FIXME: There is a race here: if the other resource sends us first the |