← Back to branch summary

~ubuntu-branches/ubuntu/vivid/messaging-app/vivid

« back to all changes in this revision

Viewing changes to src/qml/SMSDelegate.qml

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, CI Train Bot, Omer Akram, Tiago Salem Herrmann
  • Date: 2015-02-11 18:09:01 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20150211180901-w6c8jiwsvzl4ojyw
Tags: 0.1+15.04.20150211-0ubuntu1
https://launchpad.net/bugs/1418074
https://launchpad.net/bugs/1417353
[ CI Train Bot ]
* Resync trunk

[ Omer Akram ]
* Provide a pre-populated database for search test so that we don't
  conflict with the On Screen Display Notification (LP: #1418074)

[ Tiago Salem Herrmann ]
* Inject messages into the history service when it is impossible to
  send them. (LP: #1417353)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qml/SMSDelegate.qml
31
31
 
32
32
    function resendMessage()
33
33
    {
34
 
        if (!sendMessageSanityCheck()) {
35
 
            return
36
 
        }
37
 
 
38
34
        eventModel.removeEvents([root.messageData.properties]);
39
35
        // FIXME: export this information for MessageDelegate
40
 
        chatManager.sendMessage(messages.participants, textMessage, messages.account.accountId)
 
36
        messages.sendMessage(textMessage, messages.participants, [])
41
37
    }
42
38
 
43
39
    function copyMessage()