presence-cache.c: Fix avatar conflict resolution: Do not confuse self_presence and presence with self_handle from the cache
presence-cache.c: Fix avatar conflict resolution: Do not confuse self_presence and presence with self_handle from the cache

community-ssu/telepathy-gabble,community-ssu/telepathy-gabble,community-ssu/telepathy-gabble,community-ssu/telepathy-gabble