[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [wacomtablet/releng3.0] src/common: Fix lookupProperty for xcb backend
From:       Weng Xuetian <wengxt () gmail ! com>
Date:       2016-01-27 1:32:28
Message-ID: E1aOEyC-0005n6-OM () scm ! kde ! org
[Download RAW message or body]

Git commit c31339e0de76884ab2233da68c04994c99e339e1 by Weng Xuetian.
Committed on 27/01/2016 at 01:30.
Pushed by xuetianweng into branch 'releng3.0'.

Fix lookupProperty for xcb backend

There's no point check return atom value. Original implementation tends
to check the pointer is null, instead of the atom value.

M  +1    -1    src/common/x11inputdevice-xcb.cpp

http://commits.kde.org/wacomtablet/c31339e0de76884ab2233da68c04994c99e339e1

diff --git a/src/common/x11inputdevice-xcb.cpp b/src/common/x11inputdevice-xcb.cpp
index f499b7d..4d70bc1 100644
--- a/src/common/x11inputdevice-xcb.cpp
+++ b/src/common/x11inputdevice-xcb.cpp
@@ -526,7 +526,7 @@ bool X11InputDevice::lookupProperty(const QString& property, X11InputDevice::Ato
 {
     Q_D(const X11InputDevice);
 
-    if (!isOpen() || property.isEmpty() || atom == XCB_ATOM_NONE) {
+    if (!isOpen() || property.isEmpty()) {
         return false;
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]