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
177
    Tp::MessagePart body = message.at(1);
177
    Tp::MessagePart body = message.at(1);
6
178
    QString objpath;
178
    QString objpath;
7
179
179
9
180
    bool mms = header["mms"].variant().toBool();
180
    bool mms = header["x-canonical-mms"].variant().toBool();
10
181
181
11
182
    if (mms) {
182
    if (mms) {
12
183
        // pop header out
183
        // pop header out
13
@@ -426,7 +426,7 @@
14
426
    header["message-sender"] = QDBusVariant(handle);
426
    header["message-sender"] = QDBusVariant(handle);
15
427
    header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());
427
    header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());
16
428
    header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);
428
    header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);
18
429
    header["mms"] = QDBusVariant(true);
429
    header["x-canonical-mms"] = QDBusVariant(true);
19
430
    if (!subject.isEmpty())
430
    if (!subject.isEmpty())
20
431
    {
431
    {
21
432
        header["subject"] = QDBusVariant(subject);
432
        header["subject"] = QDBusVariant(subject);
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
Related bugs:	Link a bug report
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
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	177	Tp::MessagePart body = message.at(1);	177	Tp::MessagePart body = message.at(1);
6	178	QString objpath;	178	QString objpath;
7	179		179
9	180	bool mms = header["mms"].variant().toBool();	180	bool mms = header["x-canonical-mms"].variant().toBool();
10	181		181
11	182	if (mms) {	182	if (mms) {
12	183	// pop header out	183	// pop header out
13	@@ -426,7 +426,7 @@
14	426	header["message-sender"] = QDBusVariant(handle);	426	header["message-sender"] = QDBusVariant(handle);
15	427	header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());	427	header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());
16	428	header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);	428	header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);
18	429	header["mms"] = QDBusVariant(true);	429	header["x-canonical-mms"] = QDBusVariant(true);
19	430	if (!subject.isEmpty())	430	if (!subject.isEmpty())
20	431	{	431	{
21	432	header["subject"] = QDBusVariant(subject);	432	header["subject"] = QDBusVariant(subject);