Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging into 1.0-integration1.0

* '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging:
  MOBILITY-1739 fix, ensures that ipEntrySelection is always created before calling getAccountSpecificMessagesL

1 files changed, 3 insertions, 0 deletions

diff --git a/src/messaging/qmtmengine_symbian.cpp b/src/messaging/qmtmengine_symbian.cpp
index 0e9aaea5d1..960770e9fd 100644
--- a/src/messaging/qmtmengine_symbian.cpp
+++ b/src/messaging/qmtmengine_symbian.cpp
@@ -5348,6 +5348,7 @@ void CMessagesFindOperation::filterAndOrderMessages(const QMessageFilterPrivate:
                     getAccountSpecificMessagesL(messageAccount, iOrdering, privateFilter);
                 }
             } else { // NotEqual
+                ipEntrySelection = new(ELeave)CMsvEntrySelection;
                 foreach (QMessageAccount value, iOwner.iAccounts) {
                     if (!(value.messageTypes() & type)) {
                         getAccountSpecificMessagesL(value, iOrdering, privateFilter);
@@ -5358,12 +5359,14 @@ void CMessagesFindOperation::filterAndOrderMessages(const QMessageFilterPrivate:
             QMessage::TypeFlags typeFlags = static_cast<QMessage::TypeFlags>(pf->_value.toInt());
             QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pf->_comparatorValue));
             if (cmp == QMessageDataComparator::Includes) {
+                ipEntrySelection = new(ELeave)CMsvEntrySelection;
                 foreach (QMessageAccount value, iOwner.iAccounts) {
                     if (value.messageTypes() | typeFlags) {
                         getAccountSpecificMessagesL(value, iOrdering, privateFilter);
                     }
                 }
             } else { // Excludes
+                ipEntrySelection = new(ELeave)CMsvEntrySelection;
                 foreach (QMessageAccount value, iOwner.iAccounts) {
                     if (!(value.messageTypes() & typeFlags)) {
                         getAccountSpecificMessagesL(value, iOrdering, privateFilter);