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

[Alan Griffiths]

Fix the initial problems running miral-shell under Unity8

[Alan Griffiths (alan-griffiths)]

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)]

> 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

=== modified file 'miral-shell/shell_main.cpp'
--- miral-shell/shell_main.cpp	2016-11-15 12:55:30 +0000
+++ miral-shell/shell_main.cpp	2016-12-01 11:56:00 +0000
@@ -77,6 +77,8 @@
 
     return runner.run_with(
         {
+            CommandLineOption{[&](std::string const& ) { },
+                              "desktop_file_hint", "Ignored for Unity8 compatability", "miral-shell.desktop"},
             CursorTheme{"default"},
             window_managers,
             display_configuration_options,
 
=== modified file 'miral/runner.cpp'
--- miral/runner.cpp	2016-08-18 08:35:17 +0000
+++ miral/runner.cpp	2016-12-01 11:56:00 +0000
@@ -98,6 +98,7 @@
         }
         while (std::chrono::steady_clock::now() < time_limit);
 
+        setenv("MIR_SOCKET", socket_file.c_str(),  true);   // configure Mir socket
         setenv("GDK_BACKEND", "mir", true);                 // configure GTK to use Mir
         setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
         unsetenv("QT_QPA_PLATFORMTHEME");                   // Discourage Qt from unsupported theme