← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to src/client/mir_connection.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-03-10 19:28:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2
Tags: upstream-0.1.6+14.04.20140310
Import upstream version 0.1.6+14.04.20140310

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/mir_connection.cpp
16
16
 * Authored by: Thomas Guest <thomas.guest@canonical.com>
17
17
 */
18
18
 
19
 
#include "mir/logging/logger.h"
20
 
 
21
19
#include "mir_connection.h"
22
20
#include "mir_surface.h"
23
21
#include "client_platform.h"
28
26
#include "connection_surface_map.h"
29
27
#include "lifecycle_control.h"
30
28
 
 
29
#include "mir/logging/logger.h"
 
30
 
31
31
#include <algorithm>
32
32
#include <cstddef>
33
33
#include <unistd.h>
458
458
            display_request->set_output_id(output.output_id);
459
459
            display_request->set_used(output.used);
460
460
            display_request->set_current_mode(output.current_mode);
 
461
            display_request->set_current_format(output.current_format);
461
462
            display_request->set_position_x(output.position_x);
462
463
            display_request->set_position_y(output.position_y);
463
464
            display_request->set_power_mode(output.power_mode);