diff options
author | Kate Alhola <kate.alhola@nokia.com> | 2010-02-08 17:30:45 +0200 |
---|---|---|
committer | Kate Alhola <kate.alhola@nokia.com> | 2010-02-08 17:30:45 +0200 |
commit | 25b779d6d34390698fe08cace71d89f1e71e61ee (patch) | |
tree | 29c7626b0a8ab8307ecf8b3b209386fee33b5242 /src/messaging/qmessagestore_maemo.cpp | |
parent | 9a48c6300de08ddaa98006137ca1f19c7a49e8de (diff) |
Telepathyengine_maemo integration SMS/IM added
Diffstat (limited to 'src/messaging/qmessagestore_maemo.cpp')
-rw-r--r-- | src/messaging/qmessagestore_maemo.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp index d50e211bb3..7a4da052c4 100644 --- a/src/messaging/qmessagestore_maemo.cpp +++ b/src/messaging/qmessagestore_maemo.cpp @@ -41,6 +41,7 @@ #include "qmessagestore.h" #include "qmessagestore_p.h" #include "modestengine_maemo_p.h" +#include "telepathyengine_maemo_p.h" #include "maemohelpers_p.h" @@ -141,6 +142,10 @@ QMessageAccountIdList QMessageStore::queryAccounts(const QMessageAccountFilter & if (!isFiltered) { MessagingHelper::filterAccounts(accountIds, filter); } + accountIds += TelepathyEngine::instance()->queryAccounts(filter, sortOrder, limit, offset, isFiltered, isSorted); + if (!isFiltered) { + MessagingHelper::filterAccounts(accountIds, filter); + } if (!isSorted) { MessagingHelper::orderAccounts(accountIds, sortOrder); } @@ -166,7 +171,7 @@ int QMessageStore::countAccounts(const QMessageAccountFilter& filter) const int count = 0; count += ModestEngine::instance()->countAccounts(filter); - + count += TelepathyEngine::instance()->countAccounts(filter); return count; } @@ -210,7 +215,9 @@ QMessageFolder QMessageStore::folder(const QMessageFolderId& id) const QMessageAccount QMessageStore::account(const QMessageAccountId& id) const { - return ModestEngine::instance()->account(id); + QMessageAccount acc=ModestEngine::instance()->account(id); + if(acc.id()==id) return acc; + return TelepathyEngine::instance()->account(id); } QMessageManager::NotificationFilterId QMessageStore::registerNotificationFilter(const QMessageFilter &filter) |