← Back to branch summary

~gerboland/miral/release-patched

« back to all changes in this revision

Viewing changes to miral/keymap.cpp

  • Committer: Bileto Bot
  • Date: 2017-01-27 03:02:13 UTC
  • mfrom: (330.2.167 miral0)
  • Revision ID: ci-train-bot@canonical.com-20170127030213-q62prxw1xh7kasbu
https://launchpad.net/bugs/1658085
https://launchpad.net/bugs/1658159
* New upstream release 1.1.0 (https://launchpad.net/miral/+milestone/1.1)
  - ABI summary:
    . miral ABI unchanged at 2
  - Enhancements:
    . Compatibility with Mir 0.26 and update API to use the new Mir types and
      enums.
    . Logging of exceptions added to --window-management-trace
    . Rename WindowManagementPolicy::place_new_surface => place_new_window"
  - Bugs fixed:
    . top-level window is not raised along with its child (LP: #1658085)
    . miral-shell depends on default cursor theme being installed
      (LP: #1658159)

Show diffs side-by-side

added added

removed removed

Lines of Context:
miral/keymap.cpp
25
25
#include <mir/server.h>
26
26
#include <mir/version.h>
27
27
 
28
 
#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 24, 1)
 
28
#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)
 
29
#include <mir/input/keymap.h>
 
30
#include <mir/input/mir_keyboard_config.h>
 
31
#elif MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 24, 1)
29
32
#include <mir/input/keymap.h>
30
33
#include <mir/input/keyboard_configuration.h>
31
34
#endif
112
115
 
113
116
        if (keyboard_config.is_set())
114
117
        {
 
118
#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)
 
119
            keymap = keyboard_config.value().device_keymap();
 
120
#else
115
121
            keymap = keyboard_config.value().device_keymap;
 
122
#endif
116
123
        }
117
124
 
118
125
        keymap.layout = layout;