~boiko/telepathy-ofono/update_tp_qt

« back to all changes in this revision

Viewing changes to ofonotextchannel.cpp

  • Committer: Timo Jyrinki
  • Date: 2014-10-09 15:55:01 UTC
  • mfrom: (110.1.4 telepathy-ofono)
  • Revision ID: timo.jyrinki@canonical.com-20141009155501-3vuuv5cpbrx0l8ia
Manually merge 0.2+14.10.20141007-0ubuntu1

[ Ubuntu daily release ]
[ Ubuntu daily release ]
* New rebuild forced
* refresh emergency numbers when appropriate
* Use local timestamp instead of the one provided by the carrier. (LP:
  #1246198)

Show diffs side-by-side

added added

removed removed

Lines of Context:
407
407
 
408
408
    Tp::MessagePart header;
409
409
    header["message-token"] = QDBusVariant(info["SentTime"].toString() +"-" + QString::number(mMessageCounter++));
410
 
    header["message-received"] = QDBusVariant(QDateTime::fromString(info["SentTime"].toString(), Qt::ISODate).toTime_t());
 
410
    header["message-received"] = QDBusVariant(QDateTime::currentDateTime().toTime_t());
411
411
    header["message-sender"] = QDBusVariant(handle);
412
412
    header["message-sender-id"] = QDBusVariant(mPhoneNumbers[0]);
413
413
    header["message-type"] = QDBusVariant(Tp::ChannelTextMessageTypeNormal);