diff -r e8a69c93c830 -r ecf6a73a9186 messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp --- a/messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp Fri Sep 17 20:16:33 2010 +0530 +++ b/messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp Tue Oct 05 13:58:47 2010 +0530 @@ -88,6 +88,7 @@ const int MAX_VCARDS(1000); // LOCALIZED CONSTANTS +#define LOC_TITLE hbTrId("txt_messaging_title_messaging") //To,Cc.Bcc #define LOC_TO hbTrId("txt_messaging_formlabel_to") #define LOC_CC hbTrId("txt_messaging_formlabel_cc") @@ -244,7 +245,7 @@ void MsgUnifiedEditorView::addMenu() { //Create Menu Options - HbMenu* mainMenu = new HbMenu(); + HbMenu* mainMenu = this->menu(); mainMenu->setFocusPolicy(Qt::NoFocus); //if subject field / cc,bcc fields are already present don't add corresponding actions. @@ -278,7 +279,6 @@ connect(lowPriorityAction, SIGNAL(triggered()), this, SLOT(changePriority())); connect(deleteMsgAction,SIGNAL(triggered()),this, SLOT(deleteMessage())); - setMenu(mainMenu); } void MsgUnifiedEditorView::openDraftsMessage(const QVariantList& editorData) @@ -1478,15 +1478,18 @@ QString service("phonebookservices"); QString interface("com.nokia.symbian.IContactsFetch"); QString operation("multiFetch(QString,QString)"); - XQAiwRequest* request; - XQApplicationManager appManager; - request = appManager.create(service, interface, operation, true); //embedded + + XQApplicationManager appManager; + XQAiwRequest* request = appManager.create(service, interface, operation, true); //embedded + if ( request == NULL ) { QCRITICAL_WRITE("AIW-ERROR: NULL request"); return; } - + + request->setSynchronous(false); // synchronous + // Result handlers connect (request, SIGNAL(requestOk(const QVariant&)), this, SLOT(contactsFetched(const QVariant&))); @@ -1494,7 +1497,7 @@ this, SLOT(serviceRequestError(int,const QString&))); QList args; - args << QString(tr("Phonebook")); + args << LOC_TITLE; args << KCntActionAll; args << KCntFilterDisplayAll; @@ -1503,7 +1506,6 @@ { QDEBUG_WRITE_FORMAT("AIW-ERROR: Request Send failed:",request->lastError()); } - delete request; } //--------------------------------------------------------------- @@ -1515,17 +1517,14 @@ QString service("photos"); QString interface("com.nokia.symbian.IImageFetch"); QString operation("fetch()"); - XQAiwRequest* request = NULL; XQApplicationManager appManager; - request = appManager.create(service,interface, operation, true);//embedded - + XQAiwRequest* request = appManager.create(service,interface, operation, true);//embedded if(!request) { QCRITICAL_WRITE("AIW-ERROR: NULL request"); return; } - - request->setSynchronous(true); // synchronous + request->setSynchronous(false); // synchronous connect(request, SIGNAL(requestOk(const QVariant&)), this, SLOT(imagesFetched(const QVariant&))); @@ -1537,7 +1536,6 @@ { QDEBUG_WRITE_FORMAT("AIW-ERROR: Request Send failed:" , request->lastError()); } - delete request; } //--------------------------------------------------------------- @@ -1566,6 +1564,12 @@ //--------------------------------------------------------------- void MsgUnifiedEditorView::contactsFetched(const QVariant& value) { + XQAiwRequest* request = qobject_cast(this->sender()); + if(request) + { + delete request; + } + // create a vcard for each contact fetched and add as attachment QStringList attachmentList; if(createVCards(value, attachmentList) == KErrNone) @@ -1580,6 +1584,12 @@ //--------------------------------------------------------------- void MsgUnifiedEditorView::imagesFetched(const QVariant& result ) { + XQAiwRequest* request = qobject_cast(this->sender()); + if(request) + { + delete request; + } + if(result.canConvert()) { QStringList fileList = result.value(); @@ -1598,6 +1608,14 @@ void MsgUnifiedEditorView::serviceRequestError(int errorCode, const QString& errorMessage) { QDEBUG_WRITE_FORMAT(errorMessage,errorCode); + Q_UNUSED(errorCode) + Q_UNUSED(errorMessage) + + XQAiwRequest* request = qobject_cast(this->sender()); + if(request) + { + delete request; + } } //---------------------------------------------------------------