Merge lp:~tiagosh/telepathy-ofono/rename-mms-flag into lp:telepathy-ofono

Proposed by Tiago Salem Herrmann on 2015-08-10
Status: Merged
Approved by: Gustavo Pichorim Boiko on 2015-11-09
Approved revision: 163
Merged at revision: 169
Proposed branch: lp:~tiagosh/telepathy-ofono/rename-mms-flag
Merge into: lp:telepathy-ofono
Diff against target: 21 lines (+2/-2)
1 file modified
ofonotextchannel.cpp (+2/-2)
To merge this branch: bzr merge lp:~tiagosh/telepathy-ofono/rename-mms-flag
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) 2015-08-10 Approve on 2015-11-09
PS Jenkins bot continuous-integration Approve on 2015-11-05
Review via email: mp+267589@code.launchpad.net

Commit message

Rename mms flag set by telephony-service.

Description of the change

Rename mms flag set by telephony-service.

To post a comment you must log in.
160. By Tiago Salem Herrmann on 2015-08-11

rename flag in another place

161. By Tiago Salem Herrmann on 2015-08-11

merge trunk

162. By Tiago Salem Herrmann on 2015-10-09

merge trunk

163. By Tiago Salem Herrmann on 2015-11-05

merge trunk

Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ofonotextchannel.cpp'
--- ofonotextchannel.cpp 2015-05-18 13:30:00 +0000
+++ ofonotextchannel.cpp 2015-11-05 13:37:03 +0000
@@ -177,7 +177,7 @@
177 Tp::MessagePart body = message.at(1);177 Tp::MessagePart body = message.at(1);
178 QString objpath;178 QString objpath;
179179
180 bool mms = header["mms"].variant().toBool();180 bool mms = header["x-canonical-mms"].variant().toBool();
181181
182 if (mms) {182 if (mms) {
183 // pop header out183 // pop header out
@@ -426,7 +426,7 @@
426 header["message-sender"] = QDBusVariant(handle);426 header["message-sender"] = QDBusVariant(handle);
427 header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());427 header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());
428 header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);428 header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);
429 header["mms"] = QDBusVariant(true);429 header["x-canonical-mms"] = QDBusVariant(true);
430 if (!subject.isEmpty())430 if (!subject.isEmpty())
431 {431 {
432 header["subject"] = QDBusVariant(subject);432 header["subject"] = QDBusVariant(subject);

Subscribers

People subscribed via source and target branches