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
1=== modified file 'ofonotextchannel.cpp'
2--- ofonotextchannel.cpp 2015-05-18 13:30:00 +0000
3+++ ofonotextchannel.cpp 2015-11-05 13:37:03 +0000
4@@ -177,7 +177,7 @@
5 Tp::MessagePart body = message.at(1);
6 QString objpath;
7
8- bool mms = header["mms"].variant().toBool();
9+ bool mms = header["x-canonical-mms"].variant().toBool();
10
11 if (mms) {
12 // pop header out
13@@ -426,7 +426,7 @@
14 header["message-sender"] = QDBusVariant(handle);
15 header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());
16 header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);
17- header["mms"] = QDBusVariant(true);
18+ header["x-canonical-mms"] = QDBusVariant(true);
19 if (!subject.isEmpty())
20 {
21 header["subject"] = QDBusVariant(subject);

Subscribers

People subscribed via source and target branches