unity-2d

Merge lp:~gerboland/unity-2d/XKeycodeToKeysym-deprecated into lp:unity-2d

  1. XKeycodeToKeysym-deprecated
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1054
Merged at revision: 1054
Proposed branch: lp:~gerboland/unity-2d/XKeycodeToKeysym-deprecated
Merge into: lp:unity-2d
Diff against target: 21 lines (+2/-2)
1 file modified
libunity-2d-private/src/hotkey.cpp (+2/-2)
To merge this branch: bzr merge lp:~gerboland/unity-2d/XKeycodeToKeysym-deprecated
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+101356@code.launchpad.net

Commit message

XKeycodeToKeysym deprecated, use XkbKeycodeToKeysym instead. Fix compiler warning

Description of the change

XKeycodeToKeysym deprecated, use XkbKeycodeToKeysym instead. Fix compiler warning

UNBLOCK

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Good find :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libunity-2d-private/src/hotkey.cpp'
2--- libunity-2d-private/src/hotkey.cpp 2012-04-02 14:50:36 +0000
3+++ libunity-2d-private/src/hotkey.cpp 2012-04-10 11:07:21 +0000
4@@ -106,7 +106,7 @@
5 if (m_key != 0) {
6 UQ_DEBUG << "Grabbing hotkey" << QKeySequence(m_key | m_modifiers).toString();
7 } else {
8- UQ_DEBUG.nospace() << "Grabbing hotkey" << QKeySequence(m_modifiers).toString() << XKeysymToString(XKeycodeToKeysym(QX11Info::display(), m_x11key, 0));
9+ UQ_DEBUG.nospace() << "Grabbing hotkey" << QKeySequence(m_modifiers).toString() << XKeysymToString(XkbKeycodeToKeysym(QX11Info::display(), m_x11key, 0, 0));
10 }
11 _x_old_errhandler = XSetErrorHandler(_x_grabkey_errhandler);
12 XGrabKey(QX11Info::display(), m_x11key, m_x11modifiers,
13@@ -125,7 +125,7 @@
14 if (m_key != 0) {
15 UQ_DEBUG << "Ungrabbing hotkey" << QKeySequence(m_key | m_modifiers).toString();
16 } else {
17- UQ_DEBUG.nospace() << "Ungrabbing hotkey" << QKeySequence(m_modifiers).toString() << XKeysymToString(XKeycodeToKeysym(QX11Info::display(), m_x11key, 0));
18+ UQ_DEBUG.nospace() << "Ungrabbing hotkey" << QKeySequence(m_modifiers).toString() << XKeysymToString(XkbKeycodeToKeysym(QX11Info::display(), m_x11key, 0, 0));
19 }
20 XUngrabKey(QX11Info::display(), m_x11key, m_x11modifiers,
21 QX11Info::appRootWindow());

Subscribers

People subscribed via source and target branches