Fixes: NB#216923 - The skype contacts are not displayed in contact list when the...
authorXavier Claessens <xavier.claessens@collabora.co.uk>
Fri, 25 Feb 2011 14:12:54 +0000 (15:12 +0100)
committerXavier Claessens <xavier.claessens@collabora.co.uk>
Fri, 25 Feb 2011 14:15:15 +0000 (15:15 +0100)
commitcb76647955bf16201ce31d0b4bf646ee28fe3fe2
treebb865369234ceee493611ad2b040b431bf339cbf
parentf9d126e4a3bcf5712196ecc454211ae0933cd094
Fixes: NB#216923 - The skype contacts are not displayed in contact list when the account is in disabled state

Remove unmerged contacts, but keep im address for merged contacts with unknown presence and no caps
plugins/telepathy/cdtpquery.cpp
plugins/telepathy/cdtpquery.h
plugins/telepathy/cdtpstorage.cpp
plugins/telepathy/cdtpstorage.h
tests/ut_telepathyplugin/test-telepathy-plugin.cpp
tests/ut_telepathyplugin/test-telepathy-plugin.h