QtMir

Merge lp:~andreas-pokorny/qtmir/fix-1557634 into lp:qtmir

fix-1557634
Merge into trunk

Proposed by Andreas Pokorny on 2017-03-27

Status:

Merged

Approved by:

Daniel d'Andrada on 2017-03-27

Approved revision:

626

Merged at revision:

632

Proposed branch:

lp:~andreas-pokorny/qtmir/fix-1557634

Merge into:

lp:qtmir

Diff against target:

40 lines (+17/-3)

2 files modified

src/modules/Unity/Application/mirsurface.cpp (+8/-1)
src/platforms/mirserver/inputdeviceobserver.cpp (+9/-2)

To merge this branch:

bzr merge lp:~andreas-pokorny/qtmir/fix-1557634

Critical

Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2017-03-27	Approve on 2017-03-27
Unity8 CI Bot (community)	continuous-integration		Approve on 2017-03-27
Review via email: mp+321050@code.launchpad.net

Commit message

Report and consume exception that may occur on constructing a keymap

Description of the change

This handles construction exceptions that are thrown in mir when a keymap is configured that xkbcommon cannot find.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-27:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/637/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-27:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/638/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-03-27:

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andreas Pokorny

Daniel d'Andrada

Mir development team

 === modified file 'src/modules/Unity/Application/mirsurface.cpp'
 --- src/modules/Unity/Application/mirsurface.cpp	2017-03-20 21:15:13 +0000
 +++ src/modules/Unity/Application/mirsurface.cpp	2017-03-27 10:09:19 +0000
@@ -806,7 +806,14 @@
          return;
+     }
--    m_surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
++    try
++    {
++        m_surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
++    }
++    catch(std::exception const& e)
++    {
++        WARNING_MSG << "Setting keymap failed:" << e.what();
++    }
+ }
  QCursor MirSurface::cursor() const
 === modified file 'src/platforms/mirserver/inputdeviceobserver.cpp'
 --- src/platforms/mirserver/inputdeviceobserver.cpp	2017-01-26 17:50:12 +0000
 +++ src/platforms/mirserver/inputdeviceobserver.cpp	2017-03-27 10:09:19 +0000
@@ -100,7 +100,14 @@
          keymap.layout = layout.toStdString();
          keymap.variant = variant.toStdString();
--        device->apply_keyboard_configuration(std::move(keymap));
--        qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
++        try
++        {
++            device->apply_keyboard_configuration(std::move(keymap));
++            qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
++        }
++        catch(std::exception const& e)
++        {
++            qCWarning(QTMIR_MIR_KEYMAP) << "Keymap could not be applied:" << e.what();
++        }
+     }
+ }