history-service

Merge lp://staging/~tiagosh/history-service/fix-attachment-demarshaling into lp://staging/history-service

Proposed by Tiago Salem Herrmann on 2014-05-09

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2014-05-22
Approved revision:	145
Merged at revision:	144
Proposed branch:	lp://staging/~tiagosh/history-service/fix-attachment-demarshaling
Merge into:	lp://staging/history-service
Diff against target:	154 lines (+52/-9) 5 files modified Ubuntu/History/historyeventmodel.cpp (+33/-0) Ubuntu/History/historyeventmodel.h (+2/-0) Ubuntu/History/historyqmltexteventattachment.h (+7/-7) plugins/sqlite/sqlitehistoryplugin.cpp (+2/-1) src/textevent.cpp (+8/-1)
To merge this branch:	bzr merge lp://staging/~tiagosh/history-service/fix-attachment-demarshaling
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2014-05-09	Approve on 2014-05-22
PS Jenkins bot	continuous-integration		Approve on 2014-05-09
Review via email: mp+219049@code.staging.launchpad.net

- add support for removing event attachments
- fix dbus demarshaling for attachments so they don't get deleted when the event is marked as read.

- add support for removing event attachments
- fix dbus demarshaling for attachments so they don't get deleted when the event is marked as read.

---Checklist---

Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/history-service) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A

Revision history for this message