lp:~bregma/qtmir/use-ual-info

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:qtmir

Mir development team: Pending requested 2016-01-30

Diff: 3126 lines (+493/-1554)

30 files modified

debian/control (+1/-1)
src/modules/Unity/Application/CMakeLists.txt (+2/-1)
src/modules/Unity/Application/application.cpp (+22/-67)
src/modules/Unity/Application/application.h (+3/-9)
src/modules/Unity/Application/application_manager.cpp (+29/-42)
src/modules/Unity/Application/application_manager.h (+0/-3)
src/modules/Unity/Application/applicationinfo.h (+59/-0)
src/modules/Unity/Application/dbuswindowstack.cpp (+1/-1)
src/modules/Unity/Application/desktopfilereader.cpp (+0/-320)
src/modules/Unity/Application/desktopfilereader.h (+0/-78)
src/modules/Unity/Application/taskcontroller.h (+3/-3)
src/modules/Unity/Application/upstart/applicationinfo.cpp (+109/-0)
src/modules/Unity/Application/upstart/applicationinfo.h (+57/-0)
src/modules/Unity/Application/upstart/taskcontroller.cpp (+75/-93)
src/modules/Unity/Application/upstart/taskcontroller.h (+1/-2)
tests/framework/CMakeLists.txt (+3/-3)
tests/framework/fake_application_info.cpp (+31/-41)
tests/framework/fake_application_info.h (+12/-17)
tests/framework/mock_application_info.cpp (+23/-94)
tests/framework/mock_application_info.h (+17/-35)
tests/framework/mock_task_controller.cpp (+5/-17)
tests/framework/mock_task_controller.h (+2/-5)
tests/framework/qtmir_test.cpp (+0/-10)
tests/framework/qtmir_test.h (+0/-2)
tests/modules/Application/application_test.cpp (+15/-14)
tests/modules/ApplicationManager/application_manager_test.cpp (+23/-246)
tests/modules/CMakeLists.txt (+0/-1)
tests/modules/DesktopFileReader/CMakeLists.txt (+0/-22)
tests/modules/DesktopFileReader/calculator.desktop (+0/-227)
tests/modules/DesktopFileReader/desktopfilereader_test.cpp (+0/-200)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

448. By Stephen M. Webb on 2016-03-02

synch with trunk

447. By Michael Terry on 2016-02-18

And another

446. By Michael Terry on 2016-02-18

Remove leftover junk file from merge

445. By Michael Terry on 2016-02-18

Merge from trunk

444. By Michael Terry on 2016-01-28

Minor cleanup

443. By Michael Terry on 2016-01-28

Fix tests, return desktop_file_hint handling

442. By Michael Terry on 2016-01-27

Clean up a little bit

441. By Michael Terry on 2016-01-27

Add more protections against bad appIds

440. By Michael Terry on 2016-01-27

Fix compile error

439. By Michael Terry on 2016-01-27

Update to latest ual api