Merge lp://staging/~gerboland/qtmir/desktopFileReader into lp://staging/~dandrader/qtmir/parse_splash_from_desktop_file
Proposed by
Gerry Boland
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~gerboland/qtmir/desktopFileReader | ||||
| Merge into: | lp://staging/~dandrader/qtmir/parse_splash_from_desktop_file | ||||
| Diff against target: |
3963 lines (+2079/-471) 58 files modified
README (+1/-1) debian/changelog (+25/-0) debian/control (+3/-0) src/common/debughelpers.cpp (+38/-6) src/common/debughelpers.h (+2/-1) src/lttng-compiler.pri (+25/-0) src/modules/Unity/Application/Application.pro (+11/-5) src/modules/Unity/Application/application.cpp (+6/-4) src/modules/Unity/Application/application.h (+7/-6) src/modules/Unity/Application/application_manager.cpp (+14/-6) src/modules/Unity/Application/desktopfilereader.cpp (+164/-114) src/modules/Unity/Application/desktopfilereader.h (+22/-40) src/modules/Unity/Application/gscopedpointer.h (+113/-0) src/modules/Unity/Application/mirsurfaceitem.cpp (+138/-31) src/modules/Unity/Application/mirsurfaceitem.h (+38/-7) src/modules/Unity/Application/mirsurfacemanager.cpp (+13/-7) src/modules/Unity/Application/plugin.cpp (+1/-0) src/modules/Unity/Application/session.cpp (+21/-19) src/modules/Unity/Application/session.h (+35/-63) src/modules/Unity/Application/session_interface.h (+106/-0) src/modules/Unity/Application/sessionmanager.cpp (+8/-8) src/modules/Unity/Application/sessionmanager.h (+4/-4) src/modules/Unity/Application/sessionmodel.h (+2/-2) src/modules/Unity/Application/tracepoints.tp (+9/-0) src/platforms/mirserver/logging.h (+1/-0) src/platforms/mirserver/mirplacementstrategy.cpp (+5/-0) src/platforms/mirserver/mirserver.pro (+8/-0) src/platforms/mirserver/mirserverconfiguration.cpp (+12/-1) src/platforms/mirserver/qteventfeeder.cpp (+175/-18) src/platforms/mirserver/qteventfeeder.h (+31/-1) src/platforms/mirserver/sessionauthorizer.cpp (+4/-0) src/platforms/mirserver/sessionlistener.cpp (+5/-0) src/platforms/mirserver/tracepoints.tp (+10/-0) tests/google-mock.pri (+24/-0) tests/mirserver/QtEventFeeder/QtEventFeeder.pro (+16/-0) tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h (+65/-0) tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+224/-0) tests/mirserver/mirserver.pro (+2/-0) tests/modules/ApplicationManager/application_manager_test.cpp (+3/-2) tests/modules/DesktopFileReader/DesktopFileReader.pro (+15/-0) tests/modules/DesktopFileReader/calculator.desktop (+227/-0) tests/modules/DesktopFileReader/desktopfilereader_test.cpp (+128/-0) tests/modules/MirSurfaceItem/MirSurfaceItem.pro (+13/-0) tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp (+113/-0) tests/modules/SessionManager/session_manager_test.cpp (+10/-9) tests/modules/SessionManager/session_test.cpp (+5/-6) tests/modules/common/common.pri (+5/-29) tests/modules/common/mock_focus_controller.h (+9/-6) tests/modules/common/mock_mir_session.h (+14/-13) tests/modules/common/mock_prompt_session.h (+7/-4) tests/modules/common/mock_prompt_session_manager.h (+21/-18) tests/modules/common/mock_renderable.h (+9/-6) tests/modules/common/mock_session.h (+65/-0) tests/modules/common/mock_surface.h (+24/-23) tests/modules/common/qtmir_test.h (+12/-9) tests/modules/modules.pro (+1/-1) tests/test-includes.pri (+9/-0) tests/tests.pro (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~gerboland/qtmir/desktopFileReader | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel d'Andrada | Pending | ||
|
Review via email:
|
|||
Commit message
Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading localized keys
Description of the change
Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading localized keys
* Are there any related MPs required for this MP to build/function as expected? Please list.
N
* Did you perform an exploratory manual test run of your code change and any related functionality?
Y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
To post a comment you must log in.
Unmerged revisions
- 268. By Gerry Boland
-
Missing !, debug statement now makes sense
- 267. By Gerry Boland
-
Add more verbose error message if desktop file not valid or missing
- 266. By Gerry Boland
-
GDesktopInfo actually checks that the binary specified by the Exec line is installed. So need to change calculator.desktop to definitely use an installed binary
- 265. By Gerry Boland
-
Fix compiler unused warning
- 264. By Gerry Boland
-
Merge trunk
- 263. By Gerry Boland
-
Use qCWarning
- 262. By Gerry Boland
-
Sssh, not so noisy
- 261. By Gerry Boland
-
Fix typos
- 260. By Gerry Boland
-
Typos
- 259. By Gerry Boland
-
Oops, revert naughty change
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
