Merge lp:~robertcarr/unity-mir/update-to-not-use-configure-output into lp:unity-mir

[Robert Carr]

configure_output has been dropped in mir devel, update to the new API. Depends on drop dbusscreen.

configure_output has been dropped in mir devel, update to the new API. Depends on drop dbusscreen.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/139/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/276/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Looks good to me.

review: Approve

=== modified file 'src/unity-mir/displayconfigurationpolicy.cpp'
--- src/unity-mir/displayconfigurationpolicy.cpp	2014-02-12 00:23:17 +0000
+++ src/unity-mir/displayconfigurationpolicy.cpp	2014-03-06 00:15:42 +0000
@@ -37,7 +37,7 @@
 
     base_policy->apply_to(conf);
     conf.for_each_output(
-        [&](mg::DisplayConfigurationOutput const& conf_output)
+        [&](mg::UserDisplayConfigurationOutput& conf_output)
         {
             if (!conf_output.connected || !conf_output.used) return;
 
@@ -52,12 +52,7 @@
             // keep the default settings if nothing was found
             if (format == conf_output.pixel_formats.end())
                 return;
-
-            conf.configure_output(conf_output.id, true, conf_output.top_left,
-                                  conf_output.current_mode_index,
-                                  *format,
-                                  conf_output.power_mode,
-                                  conf_output.orientation
-                                 );
+            
+            conf_output.current_format = *format;
         });
 }