1
=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
2
--- src/modules/Unity/Application/mirsurface.cpp	2017-03-20 21:15:13 +0000
3
+++ src/modules/Unity/Application/mirsurface.cpp	2017-03-27 10:09:19 +0000
4
@@ -806,7 +806,14 @@
5
806
        return;
806
        return;
6
807
    }
807
    }
7
808
808
9
809
    m_surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
809
    try
10
810
    {
11
811
        m_surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
12
812
    }
13
813
    catch(std::exception const& e)
14
814
    {
15
815
        WARNING_MSG << "Setting keymap failed:" << e.what();
16
816
    }
17
810
}
817
}
18
811
818
19
812
QCursor MirSurface::cursor() const
819
QCursor MirSurface::cursor() const
20
813
820
21
=== modified file 'src/platforms/mirserver/inputdeviceobserver.cpp'
22
--- src/platforms/mirserver/inputdeviceobserver.cpp	2017-01-26 17:50:12 +0000
23
+++ src/platforms/mirserver/inputdeviceobserver.cpp	2017-03-27 10:09:19 +0000
24
@@ -100,7 +100,14 @@
25
100
        keymap.layout = layout.toStdString();
100
        keymap.layout = layout.toStdString();
26
101
        keymap.variant = variant.toStdString();
101
        keymap.variant = variant.toStdString();
27
102
102
30
103
        device->apply_keyboard_configuration(std::move(keymap));
103
        try
31
104
        qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
104
        {
32
105
            device->apply_keyboard_configuration(std::move(keymap));
33
106
            qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
34
107
        }
35
108
        catch(std::exception const& e)
36
109
        {
37
110
            qCWarning(QTMIR_MIR_KEYMAP) << "Keymap could not be applied:" << e.what();
38
111
        }
39
105
    }
112
    }
40
106
}
113
}
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
1	=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
2	--- src/modules/Unity/Application/mirsurface.cpp 2017-03-20 21:15:13 +0000
3	+++ src/modules/Unity/Application/mirsurface.cpp 2017-03-27 10:09:19 +0000
4	@@ -806,7 +806,14 @@
5	806	return;	806	return;
6	807	}	807	}
7	808		808
9	809	m_surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");	809	try
10			810	{
11			811	m_surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
12			812	}
13			813	catch(std::exception const& e)
14			814	{
15			815	WARNING_MSG << "Setting keymap failed:" << e.what();
16			816	}
17	810	}	817	}
18	811		818
19	812	QCursor MirSurface::cursor() const	819	QCursor MirSurface::cursor() const
20	813		820
21	=== modified file 'src/platforms/mirserver/inputdeviceobserver.cpp'
22	--- src/platforms/mirserver/inputdeviceobserver.cpp 2017-01-26 17:50:12 +0000
23	+++ src/platforms/mirserver/inputdeviceobserver.cpp 2017-03-27 10:09:19 +0000
24	@@ -100,7 +100,14 @@
25	100	keymap.layout = layout.toStdString();	100	keymap.layout = layout.toStdString();
26	101	keymap.variant = variant.toStdString();	101	keymap.variant = variant.toStdString();
27	102		102
30	103	device->apply_keyboard_configuration(std::move(keymap));	103	try
31	104	qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";	104	{
32			105	device->apply_keyboard_configuration(std::move(keymap));
33			106	qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
34			107	}
35			108	catch(std::exception const& e)
36			109	{
37			110	qCWarning(QTMIR_MIR_KEYMAP) << "Keymap could not be applied:" << e.what();
38			111	}
39	105	}	112	}
40	106	}	113	}