MirAL

Merge lp:~alan-griffiths/miral/basic-Unity8-compatibility into lp:miral

  1. basic-Unity8-compatibility
  2. Merge into trunk
Proposed by Alan Griffiths on 2016-12-01
Status: Merged
Approved by: Gerry Boland on 2016-12-02
Approved revision: 463
Merged at revision: 463
Proposed branch: lp:~alan-griffiths/miral/basic-Unity8-compatibility
Merge into: lp:miral
Diff against target: 24 lines (+3/-0)
2 files modified
miral-shell/shell_main.cpp (+2/-0)
miral/runner.cpp (+1/-0)
To merge this branch: bzr merge lp:~alan-griffiths/miral/basic-Unity8-compatibility
Reviewer Review Type Date Requested Status
Gerry Boland 2016-12-01 Approve on 2016-12-02
Review via email: mp+312246@code.launchpad.net

Commit Message

Fix the initial problems running miral-shell under Unity8

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

This at least connects:

$ miral-shell --host ${XDG_RUNTIME_DIR}/mir_socket --file ${XDG_RUNTIME_DIR}/not_mir_socket --startup qterminal

Alan Griffiths (alan-griffiths) wrote :

> This at least connects:
>
> $ miral-shell --host ${XDG_RUNTIME_DIR}/mir_socket --file
> ${XDG_RUNTIME_DIR}/not_mir_socket --startup qterminal

That should be:

$ miral-shell --host ${XDG_RUNTIME_DIR}/mir_socket --file ${XDG_RUNTIME_DIR}/not_mir_socket --startup gnome-terminal --desktop_file_hint=miral-shel.desktop

Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'miral-shell/shell_main.cpp'
2--- miral-shell/shell_main.cpp 2016-11-15 12:55:30 +0000
3+++ miral-shell/shell_main.cpp 2016-12-01 11:56:00 +0000
4@@ -77,6 +77,8 @@
5
6 return runner.run_with(
7 {
8+ CommandLineOption{[&](std::string const& ) { },
9+ "desktop_file_hint", "Ignored for Unity8 compatability", "miral-shell.desktop"},
10 CursorTheme{"default"},
11 window_managers,
12 display_configuration_options,
13
14=== modified file 'miral/runner.cpp'
15--- miral/runner.cpp 2016-08-18 08:35:17 +0000
16+++ miral/runner.cpp 2016-12-01 11:56:00 +0000
17@@ -98,6 +98,7 @@
18 }
19 while (std::chrono::steady_clock::now() < time_limit);
20
21+ setenv("MIR_SOCKET", socket_file.c_str(), true); // configure Mir socket
22 setenv("GDK_BACKEND", "mir", true); // configure GTK to use Mir
23 setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
24 unsetenv("QT_QPA_PLATFORMTHEME"); // Discourage Qt from unsupported theme

Subscribers

People subscribed via source and target branches