Merge lp:~robertcarr/platform-api/update-mir-deprecation into lp:platform-api

[Robert Carr]

Update to avoid use of a deprecated mir function (mir_connection_get_display_info). (LP: #1369425)

Just noticed this while building stuff. Update to avoid use of a deprecated mir function.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/platform-api-ci/242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/76

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/242/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

This still relevant?

review: Needs Information

[Alberto Aguirre (albaguirre)]

Yeah still relevant, deprecated api is still used except now in one more place:

src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp
173: mir_connection_get_display_info(instance->connection(), display);

review: Needs Fixing

Unmerged revisions

205. By Robert Carr on 2014-03-27

Update deprecated mir API usage

=== modified file 'src/ubuntu/mirclient/window_mirclient.cpp'
--- src/ubuntu/mirclient/window_mirclient.cpp	2013-10-14 21:22:49 +0000
+++ src/ubuntu/mirclient/window_mirclient.cpp	2014-03-27 20:26:05 +0000
@@ -23,6 +23,8 @@
 
 #include "mircommon/event_helpers_mir.h"
 
+#include <assert.h>
+
 namespace uamc = ubuntu::application::mir::client;
 namespace uaum = ubuntu::application::ui::mir;
 
@@ -69,9 +71,13 @@
 static MirPixelFormat
 mir_choose_default_pixel_format(MirConnection *connection)
 {
-    MirDisplayInfo info;
-    mir_connection_get_display_info(connection, &info);
-    return info.supported_pixel_format[0];
+    MirPixelFormat format;
+    unsigned num_formats;
+
+    mir_connection_get_available_surface_formats(connection, &format, 1, &num_formats);
+    assert(num_formats == 1);
+
+    return format;
 }
 
 static MirSurface*