Merge lp:~alan-griffiths/miral/fix-1660933 into lp:miral

Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 498
Merged at revision: 502
Proposed branch: lp:~alan-griffiths/miral/fix-1660933
Merge into: lp:miral
Diff against target: 12 lines (+2/-0)
1 file modified
miral-kiosk/kiosk_main.cpp (+2/-0)
To merge this branch: bzr merge lp:~alan-griffiths/miral/fix-1660933
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+316091@code.launchpad.net

Commit message

miral-kiosk] ignore "--desktop_file_hint=miral-shell.desktop" on command-line. (LP: #1660933)

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Would supporting the "ignore all arguments passed after a -- " unofficial standard be possible? Because then this would work:

miral-shell -- --desktop_file_hint=miral-shell.desktop

and this would not be so unity8 specific

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> Would supporting the "ignore all arguments passed after a -- " unofficial
> standard be possible? Because then this would work:
>
> miral-shell -- --desktop_file_hint=miral-shell.desktop
>
> and this would not be so unity8 specific

MirAL uses the Mir command-line handler, I don't think that (currently) has that functionality. We should request an enhancement.

Revision history for this message
Gerry Boland (gerboland) wrote :

ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'miral-kiosk/kiosk_main.cpp'
--- miral-kiosk/kiosk_main.cpp 2016-11-08 10:44:17 +0000
+++ miral-kiosk/kiosk_main.cpp 2017-02-01 10:45:51 +0000
@@ -89,6 +89,8 @@
8989
90 return MirRunner{argc, argv}.run_with(90 return MirRunner{argc, argv}.run_with(
91 {91 {
92 CommandLineOption{[&](std::string const& ) { },
93 "desktop_file_hint", "Ignored for Unity8 compatability", "miral-shell.desktop"},
92 set_window_managment_policy<KioskWindowManagerPolicy>(splash),94 set_window_managment_policy<KioskWindowManagerPolicy>(splash),
93 SetApplicationAuthorizer<KioskAuthorizer>{splash},95 SetApplicationAuthorizer<KioskAuthorizer>{splash},
94 Keymap{},96 Keymap{},

Subscribers

People subscribed via source and target branches