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

List:       kde-commits
Subject:    [plasma-desktop] kcms/touchpad/src/backends/x11: remove the duplicate m_touchpadOffAtom member.
From:       Weng Xuetian <wengxt () gmail ! com>
Date:       2016-01-20 18:44:39
Message-ID: E1aLxkF-0005CN-5W () scm ! kde ! org
[Download RAW message or body]

Git commit cda58f0e256d53e66ca44b77fa7307ee670b8313 by Weng Xuetian.
Committed on 20/01/2016 at 18:44.
Pushed by xuetianweng into branch 'master'.

remove the duplicate m_touchpadOffAtom member.

m_touchpadOffAtom is already in XlibTouchpad, which makes ctor of
SynapticsTouchpad initialize wrong atom.

CCBUG: 357097

M  +1    -1    kcms/touchpad/src/backends/x11/synapticstouchpad.h

http://commits.kde.org/plasma-desktop/cda58f0e256d53e66ca44b77fa7307ee670b8=
313

diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.h b/kcms/touc=
hpad/src/backends/x11/synapticstouchpad.h
index 716687b..de75125 100644
--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.h
+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.h
@@ -28,7 +28,7 @@ public:
     SynapticsTouchpad(Display *display, int deviceId);
 =

 private:
-    XcbAtom m_capsAtom, m_touchpadOffAtom;
+    XcbAtom m_capsAtom;
     int m_resX, m_resY;
     QMap<QString, QString> m_negate;
     QStringList m_scaleByResX, m_scaleByResY, m_toRadians;
[prev in list] [next in list] [prev in thread] [next in thread]