Merge lp:~alan-griffiths/unity-system-compositor/prepare-for-Mir-0.1.7 into lp:unity-system-compositor

[Alan Griffiths]

Changes for Mir 0.1.7

Changes for Mir 0.1.7

[kevin gunn (kgunn72)]

review: Approve

=== modified file 'src/dbus_screen.cpp'
--- src/dbus_screen.cpp	2014-03-11 03:37:11 +0000
+++ src/dbus_screen.cpp	2014-03-17 15:13:16 +0000
@@ -34,19 +34,11 @@
     std::shared_ptr<mg::DisplayConfiguration> displayConfig = display->configuration();
     std::shared_ptr<mc::Compositor> compositor = config->the_compositor();
 
-    displayConfig->for_each_output([&](const mg::DisplayConfigurationOutput displayConfigOutput) {
-        if (displayConfigOutput.power_mode != mode) {
-            displayConfig->configure_output(
-                        displayConfigOutput.id,         //unchanged
-                        displayConfigOutput.used,       //unchanged
-                        displayConfigOutput.top_left,   //unchanged
-                        displayConfigOutput.current_mode_index, //unchanged
-                        displayConfigOutput.current_format,
-                        mode,
-                        displayConfigOutput.orientation //unchanged
-                        );
+    displayConfig->for_each_output(
+        [&](const mg::UserDisplayConfigurationOutput displayConfigOutput) {
+            displayConfigOutput.power_mode=mode;
         }
-    });
+    );
 
     if (mode != MirPowerMode::mir_power_mode_on)
         compositor->stop();
 
=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2014-03-17 15:13:16 +0000
+++ src/system_compositor.cpp	2014-03-17 15:13:16 +0000
@@ -233,8 +233,6 @@
             ("version", "Show version of Unity System Compositor")
             ("public-socket", po::value<bool>(), "Make the socket file publicly writable")
             ("power-off-delay", po::value<int>(), "Delay in milliseconds before powering off screen [int]");
-
-        setenv("MIR_SERVER_STANDALONE", "true", 0); // Default to standalone
     }
 
     void parse_config_file(