messaging-app

Merge lp:~tiagosh/messaging-app/rtm-14.09-fix-1420976 into lp:messaging-app/rtm-14.09

  1. rtm-14.09-fix-1420976
  2. Merge into rtm-14.09
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Bill Filler
Approved revision: 209
Merged at revision: 210
Proposed branch: lp:~tiagosh/messaging-app/rtm-14.09-fix-1420976
Merge into: lp:messaging-app/rtm-14.09
Diff against target: 11 lines (+1/-1)
1 file modified
src/qml/MessageDelegateFactory.qml (+1/-1)
To merge this branch: bzr merge lp:~tiagosh/messaging-app/rtm-14.09-fix-1420976
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+249421@code.launchpad.net

Commit message

Disable spinner for incoming messages.

Description of the change

Disable spinner for incoming messages.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/MessageDelegateFactory.qml'
--- src/qml/MessageDelegateFactory.qml 2014-10-07 16:57:03 +0000
+++ src/qml/MessageDelegateFactory.qml 2015-02-11 22:12:26 +0000
@@ -114,7 +114,7 @@
114 width: units.gu(2)114 width: units.gu(2)
115 visible: running && !selectionMode115 visible: running && !selectionMode
116 // if temporarily failed or unknown status, then show the spinner116 // if temporarily failed or unknown status, then show the spinner
117 running: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||117 running: !incoming && (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
118 textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed)118 textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed)
119 }119 }
120120

Subscribers

People subscribed via source and target branches