Merge lp:~tiagosh/telephony-service/update-mms-flag into lp:telephony-service

[Tiago Salem Herrmann]

Update mms flag so telephony-service-indicator can correctly manage attachments.

Update mms flag so telephony-service-indicator can correctly manage attachments.

[lp:~tiagosh/telephony-service/update-mms-flag]

1159. By Tiago Salem Herrmann on 2016-01-05

remove wrong commit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1159
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/660/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/328
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/328

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/660/rebuild

review: Approve (continuous-integration)

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2015-12-07 17:55:47 +0000
+++ indicator/textchannelobserver.cpp	2016-01-05 17:14:49 +0000
@@ -392,7 +392,7 @@
     AccountEntry *account = TelepathyHelper::instance()->accountForId(accountId);
 
     Tp::MessagePartList messageParts = message.parts();
-    bool mms = message.header()["mms"].variant().toBool();
+    bool mms = message.header()["x-canonical-mms"].variant().toBool();
     if (mms) {
         // remove header
         messageParts.pop_front();