diff -r b1f0785c289d -r 4f501b74aeb1 messagingapp/msgui/appengine/src/conversationsengine.cpp --- a/messagingapp/msgui/appengine/src/conversationsengine.cpp Tue Jul 13 22:09:22 2010 +0530 +++ b/messagingapp/msgui/appengine/src/conversationsengine.cpp Sun Jul 25 18:59:19 2010 +0530 @@ -47,14 +47,15 @@ ConversationsEngine::ConversationsEngine(QObject* parent): QObject(parent), mDraftsModel(NULL) { - mConversationMsgStoreHandler = new ConversationMsgStoreHandler; + QT_TRAP_THROWING(mConversationMsgStoreHandler = new ConversationMsgStoreHandler); + mConversationsSummaryModel = new ConversationsSummaryModel(this); mConversationsModel = new ConversationsModel(mConversationMsgStoreHandler, this); - d_ptr = new ConversationsEnginePrivate(mConversationMsgStoreHandler, + QT_TRAP_THROWING( d_ptr = new ConversationsEnginePrivate(mConversationMsgStoreHandler, mConversationsSummaryModel, - mConversationsModel); + mConversationsModel)); connect (mConversationsModel, SIGNAL(conversationViewEmpty()), @@ -170,6 +171,7 @@ { int error; TRAP(error, d_ptr->deleteAllDraftMessagesL()); + qt_symbian_throwIfError(error); } //--------------------------------------------------------------- @@ -227,7 +229,9 @@ int error; CCsClientConversation* clientConv = NULL; TRAP(error, clientConv = d_ptr->getConversationFromConversationIdL(conversationId)); - + + qt_symbian_throwIfError(error); + HBufC *name = clientConv->GetDisplayName(); if (name && name->Length()) { @@ -329,7 +333,7 @@ int newConversationId) { //also register for subscription now - d_ptr->registerAgainForConversationUpdatesL(newConversationId); + QT_TRAP_THROWING(d_ptr->registerAgainForConversationUpdatesL(newConversationId)); } //---------------------------------------------------------------