419 if (!outgoing.parentAccountId().isValid()) { |
419 if (!outgoing.parentAccountId().isValid()) { |
420 outgoing.setParentAccountId(accountId); |
420 outgoing.setParentAccountId(accountId); |
421 } |
421 } |
422 |
422 |
423 if (account.messageTypes() & QMessage::Sms) { |
423 if (account.messageTypes() & QMessage::Sms) { |
424 retVal = TelepathyEngine::instance()->sendMessage(message); |
424 retVal = TelepathyEngine::instance()->sendMessage(outgoing); |
425 } else if (account.messageTypes() & QMessage::InstantMessage) { |
425 } else if (account.messageTypes() & QMessage::InstantMessage) { |
426 retVal = TelepathyEngine::instance()->sendMessage(message); |
426 retVal = TelepathyEngine::instance()->sendMessage(outgoing); |
427 } else if (account.messageTypes() & QMessage::Mms) { |
427 } else if (account.messageTypes() & QMessage::Mms) { |
428 d_ptr->_error = QMessageManager::NotYetImplemented; |
428 d_ptr->_error = QMessageManager::NotYetImplemented; |
429 qWarning() << "QMessageService::send not yet implemented for MMS"; |
429 qWarning() << "QMessageService::send not yet implemented for MMS"; |
430 retVal = false; |
430 retVal = false; |
431 } else if (account.messageTypes() & QMessage::Email) { |
431 } else if (account.messageTypes() & QMessage::Email) { |
482 return false; // stub |
482 return false; // stub |
483 } |
483 } |
484 |
484 |
485 bool QMessageService::retrieveBody(const QMessageId& id) |
485 bool QMessageService::retrieveBody(const QMessageId& id) |
486 { |
486 { |
487 Q_UNUSED(id) |
487 if (d_ptr->_active) { |
488 return false; // stub |
488 return false; |
|
489 } |
|
490 |
|
491 if (!id.isValid()) { |
|
492 d_ptr->_error = QMessageManager::InvalidId; |
|
493 return false; |
|
494 } |
|
495 |
|
496 d_ptr->_active = true; |
|
497 d_ptr->_error = QMessageManager::NoError; |
|
498 |
|
499 bool retVal = true; |
|
500 d_ptr->stateChanged(QMessageService::ActiveState); |
|
501 |
|
502 if (id.toString().startsWith("MO_")) { |
|
503 retVal = ModestEngine::instance()->retrieveBody(*this, id); |
|
504 if (retVal == true) { |
|
505 d_ptr->_pendingRequestCount = 1; |
|
506 } |
|
507 } else { |
|
508 retVal = false; |
|
509 } |
|
510 |
|
511 if (retVal == false) { |
|
512 d_ptr->setFinished(retVal); |
|
513 } |
|
514 |
|
515 return retVal; |
489 } |
516 } |
490 |
517 |
491 bool QMessageService::retrieve(const QMessageId &messageId, const QMessageContentContainerId& id) |
518 bool QMessageService::retrieve(const QMessageId &messageId, const QMessageContentContainerId& id) |
492 { |
519 { |
493 Q_UNUSED(messageId) |
520 if (d_ptr->_active) { |
494 Q_UNUSED(id) |
521 return false; |
495 return false; // stub |
522 } |
|
523 |
|
524 if (!id.isValid()) { |
|
525 d_ptr->_error = QMessageManager::InvalidId; |
|
526 return false; |
|
527 } |
|
528 |
|
529 d_ptr->_active = true; |
|
530 d_ptr->_error = QMessageManager::NoError; |
|
531 |
|
532 bool retVal = true; |
|
533 d_ptr->stateChanged(QMessageService::ActiveState); |
|
534 |
|
535 if (messageId.toString().startsWith("MO_")) { |
|
536 retVal = ModestEngine::instance()->retrieve(*this, messageId, id, NULL); |
|
537 if (retVal == true) { |
|
538 d_ptr->_pendingRequestCount = 1; |
|
539 } |
|
540 } else { |
|
541 retVal = false; |
|
542 } |
|
543 |
|
544 if (retVal == false) { |
|
545 d_ptr->setFinished(retVal); |
|
546 } |
|
547 |
|
548 return retVal; |
496 } |
549 } |
497 |
550 |
498 bool QMessageService::show(const QMessageId& id) |
551 bool QMessageService::show(const QMessageId& id) |
499 { |
552 { |
500 if (d_ptr->_active) { |
553 if (d_ptr->_active) { |