LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File 0002-remove-the-duplicate-m_touchpadOffAtom-member.patch of Package plasma5-desktop (Project home:alarrosa:branches:fix-shutdown)

From ec9d17cfdaaf5517a02a7df71088f0133e319e37 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Wed, 20 Jan 2016 10:40:38 -0800
Subject: [PATCH 2/3] remove the duplicate m_touchpadOffAtom member.

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

CCBUG: 357097
(cherry picked from commit cda58f0e256d53e66ca44b77fa7307ee670b8313)
---
 kcms/touchpad/src/backends/x11/synapticstouchpad.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.h b/kcms/touchpad/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;
-- 
2.6.2