Hello community,
here is the log from the commit of package synaptiks for openSUSE:Factory
checked in at Sun Apr 25 18:55:27 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/synaptiks/synaptiks.changes 2010-03-29 21:55:01.000000000 +0200
@@ -0,0 +1,61 @@
+-------------------------------------------------------------------
+Mon Mar 29 19:38:58 UTC 2010 - thomas@tleine.de
+
+- backport rev 1097582 from kde repository to Version 0.3.2
+ * fix crashing when configuration is opened in system-settings
+ b.k.o #226005 or http://bitbucket.org/lunar/synaptiks/issue/32/
+
+-------------------------------------------------------------------
+Fri Feb 5 06:23:39 UTC 2010 - tittiatcoke@gmail.com
+
+- update to version 0.3.2
+ * Fixed German translation
+ * Fixed “Ignore the following mouse devices” setting
+
+-------------------------------------------------------------------
+Tue Feb 2 14:41:33 UTC 2010 - tittiatcoke@gmail.com
+
+- update to version 0.3.1
+ * updated Danish translation
+ * updated Turkish translation
+
+-------------------------------------------------------------------
+Sat Jan 30 17:22:11 UTC 2010 - tittiatcoke@gmail.com
+
+- update to version 0.3.0
+ * “Capabilities” page renamed to “Touchpad information” page
+ * Touchpad state at startup can be configured
+ * Touchpad name is shown in touchpad information page
+ * Split synaptiks into a KDED daemon, a System Settings module,
+ and a Plasma applet
+
+-------------------------------------------------------------------
+Tue Jan 5 12:12:04 UTC 2010 - tittiatcoke@gmail.com
+
+- update to version 0.2.1
+ * Added Danish translation
+ * Fixed potential memory leak
+
+-------------------------------------------------------------------
+Wed Nov 25 10:28:11 UTC 2009 - tittiatcoke@gmail.com
+
+- Update to version 0.2.0
+ * New:
+ + The delay before re-enabling the touchpad after keyboard activity
+ can be configured
+ + Shortcuts can be configured from context menu
+ + The treshold speed for conventional coasting can be configured
+ + Added tapping settings
+ + Added handbook
+ + Added Russian and Turkish translation
+ * Bugs:
+ + Show only one notification for each error
+ + Notification configuration merged into a single dialog accessible
+ from context menu
+ + Disable synaptiks, if no touchpad is found
+ + Fixed version check to maintain compatibility with Xinput 2.0
+ + The touchpad is no longer switched on by stopping typing, if it was
+ disabled by a plugged mouse device
+ + The touchpad is switched on again, if mouse device management is disabled
+ + Handle changes to the list of ignored mouse devices correctly
+
calling whatdependson for head-i586
New:
----
svn-1097582-backport.diff
synaptiks-0.3.2.tar.bz2
synaptiks.changes
synaptiks.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ synaptiks.spec ++++++
#
# spec file for package synaptiks (Version 0.3.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright 2009 Buschmann
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
BuildRequires: kdebase4-workspace-devel >= 4.3.0
BuildRequires: xorg-x11-proto-devel
BuildRequires: update-desktop-files
Name: synaptiks
Summary: A touchpad management tool for KDE
Version: 0.3.2
Release: 1
License: BSD
Group: System/GUI/KDE
Url: http://www.kde-look.org/content/show.php/synaptiks?content=114270
Source0: synaptiks-%{version}.tar.bz2
Patch1: svn-1097582-backport.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-workspace
%kde4_runtime_requires
%description
synaptiks is a touchpad management tool for KDE. It provides a simple
configuration interface and can automatically switch off your touchpad
on keyboard activity or if mouse devices are plugged.
Author:
--------
Sebastian Wiesner
%prep
%setup -n %{name}-%{version}
%patch1
%build
%cmake_kde4 -d build
%make_jobs
%install
cd build
%kde4_makeinstall
%kde_post_install
cd ..
%find_lang %{name}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%doc CHANGES README COPYING
%dir /usr/share/kde4/apps/synaptiks
%dir /usr/share/kde4/apps/synaptiks/pics
%{_libdir}/kde4/kcm_synaptiks.so
%{_libdir}/kde4/kded_synaptiks.so
%{_libdir}/kde4/plasma_applet_synaptiks.so
/usr/share/dbus-1/interfaces/*.xml
/usr/share/icons/hicolor/scalable/apps/synaptiks.svgz
/usr/share/kde4/apps/synaptiks/pics/*
/usr/share/kde4/apps/synaptiks/synaptiks.notifyrc
/usr/share/kde4/config.kcfg/*.kcfg
/usr/share/kde4/services/kded/synaptiks.desktop
/usr/share/kde4/services/*.desktop
%changelog
++++++ svn-1097582-backport.diff ++++++
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/de.lunaryorn.Touchpad.xml synaptiks-0.3.2/src/daemon/de.lunaryorn.Touchpad.xml
--- src/daemon/de.lunaryorn.Touchpad.xml 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/de.lunaryorn.Touchpad.xml 2010-03-29 22:05:27.147510532 +0200
@@ -3,15 +3,2 @@
<interface name="de.lunaryorn.Touchpad">
- <property name="on" type="b" access="readwrite"/>
- <property name="circularScrolling" type="b" access="readwrite"/>
- <property name="CircularScrollingTrigger" type="y" access="readwrite"/>
- <property name="horizontalEdgeScrolling" type="b" access="readwrite"/>
- <property name="verticalEdgeScrolling" type="b" access="readwrite"/>
- <property name="cornerCoasting" type="b" access="readwrite"/>
- <property name="costingSpeed" type="d" access="readwrite"/>
- <property name="cornerButtons" type="ay" access="readwrite"/>
- <property name="fingerButtons" type="ay" access="readwrite"/>
- <property name="hasLeftButton" type="b" access="read"/>
- <property name="hasMiddleButton" type="b" access="read"/>
- <property name="hasRightButton" type="b" access="read"/>
- <property name="fingerDetection" type="i" access="read"/>
<method name="isOn">
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpadadaptor.cpp synaptiks-0.3.2/src/daemon/touchpadadaptor.cpp
--- src/daemon/touchpadadaptor.cpp 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpadadaptor.cpp 2010-03-29 22:05:27.151508909 +0200
@@ -40,6 +40,4 @@ using namespace synaptiks;
template<typename T>
-T respondError(const QXDeviceError &error) {
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError("de.lunaryorn.TouchpadError",
- error.toString()));
+T respondError(Touchpad *touchpad, const QXDeviceError &error) {
+ touchpad->sendErrorReply("de.lunaryorn.TouchpadError", error.toString());
return T();
@@ -58,3 +56,3 @@ QString TouchpadAdaptor::name() const {
} catch (const QXDeviceError &error) {
- return respondError<QString>(error);
+ return respondError<QString>(this->parent(), error);
}
@@ -66,3 +64,3 @@ bool TouchpadAdaptor::isOn() const {
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -74,3 +72,3 @@ void TouchpadAdaptor::setOn(bool on) {
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -82,3 +80,3 @@ bool TouchpadAdaptor::circularScrolling(
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -90,3 +88,3 @@ void TouchpadAdaptor::setCircularScrolli
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -98,3 +96,3 @@ uchar TouchpadAdaptor::circularScrolling
} catch (const QXDeviceError &error) {
- return respondError<uchar>(error);
+ return respondError<uchar>(this->parent(), error);
}
@@ -108,5 +106,4 @@ void TouchpadAdaptor::setCircularScrolli
Touchpad::TopLeftCornerTrigger);
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError("de.lunaryorn.TouchpadError",
- message));
+ this->parent()->sendErrorReply("de.lunaryorn.TouchpadError",
+ message);
} else {
@@ -116,3 +113,3 @@ void TouchpadAdaptor::setCircularScrolli
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -124,3 +121,3 @@ bool TouchpadAdaptor::horizontalEdgeScro
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -132,3 +129,3 @@ void TouchpadAdaptor::setHorizontalEdgeS
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -140,3 +137,3 @@ bool TouchpadAdaptor::verticalEdgeScroll
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -148,3 +145,3 @@ void TouchpadAdaptor::setVerticalEdgeScr
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -156,3 +153,3 @@ bool TouchpadAdaptor::cornerCoasting() c
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -164,3 +161,3 @@ void TouchpadAdaptor::setCornerCoasting(
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -172,3 +169,3 @@ double TouchpadAdaptor::coastingSpeed()
} catch (const QXDeviceError &error) {
- return respondError<double>(error);
+ return respondError<double>(this->parent(), error);
}
@@ -180,3 +177,3 @@ void TouchpadAdaptor::setCoastingSpeed(d
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -188,3 +185,3 @@ QByteArray TouchpadAdaptor::cornerButton
} catch (const QXDeviceError &error) {
- return respondError<QByteArray>(error);
+ return respondError<QByteArray>(this->parent(), error);
}
@@ -198,5 +195,3 @@ void TouchpadAdaptor::setCornerButtons(c
"The argument must have at least %1 elements", 4);
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError(
- "de.lunaryorn.TouchpadError", message));
+ this->parent()->sendErrorReply("de.lunaryorn.TouchpadError", message);
}
@@ -204,3 +199,3 @@ void TouchpadAdaptor::setCornerButtons(c
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -212,3 +207,3 @@ QByteArray TouchpadAdaptor::fingerButton
} catch (const QXDeviceError &error) {
- return respondError<QByteArray>(error);
+ return respondError<QByteArray>(this->parent(), error);
}
@@ -222,5 +217,3 @@ void TouchpadAdaptor::setFingerButtons(c
"The argument must have at least %1 elements", 3);
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError(
- "de.lunaryorn.TouchpadError", message));
+ this->parent()->sendErrorReply("de.lunaryorn.TouchpadError", message);
}
@@ -228,3 +221,3 @@ void TouchpadAdaptor::setFingerButtons(c
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -236,3 +229,3 @@ bool TouchpadAdaptor::hasLeftButton() co
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -244,3 +237,3 @@ bool TouchpadAdaptor::hasMiddleButton()
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -252,3 +245,3 @@ bool TouchpadAdaptor::hasRightButton() c
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -260,3 +253,3 @@ int TouchpadAdaptor::fingerDetection() c
} catch (const QXDeviceError &error) {
- return respondError<int>(error);
+ return respondError<int>(this->parent(), error);
}
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpadadaptor.h synaptiks-0.3.2/src/daemon/touchpadadaptor.h
--- src/daemon/touchpadadaptor.h 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpadadaptor.h 2010-03-29 22:05:27.153510682 +0200
@@ -52,26 +52,2 @@ namespace synaptiks {
- public:
- Q_PROPERTY(QString name READ name)
- Q_PROPERTY(bool on READ isOn WRITE setOn)
- Q_PROPERTY(bool circularScrolling
- READ circularScrolling WRITE setCircularScrolling)
- Q_PROPERTY(uchar CircularScrollingTrigger READ circularScrollingTrigger
- WRITE setCircularScrollingTrigger)
- Q_PROPERTY(bool horizontalEdgeScrolling READ horizontalEdgeScrolling
- WRITE setHorizontalEdgeScrolling)
- Q_PROPERTY(bool verticalEdgeScrolling READ verticalEdgeScrolling
- WRITE setVerticalEdgeScrolling)
- Q_PROPERTY(bool cornerCoasting
- READ cornerCoasting WRITE setCornerCoasting)
- Q_PROPERTY(double costingSpeed READ coastingSpeed
- WRITE setCoastingSpeed DESIGNABLE false)
- Q_PROPERTY(QByteArray cornerButtons
- READ cornerButtons WRITE setCornerButtons)
- Q_PROPERTY(QByteArray fingerButtons
- READ fingerButtons WRITE setFingerButtons)
- Q_PROPERTY(bool hasLeftButton READ hasLeftButton)
- Q_PROPERTY(bool hasMiddleButton READ hasMiddleButton)
- Q_PROPERTY(bool hasRightButton READ hasRightButton)
- Q_PROPERTY(int fingerDetection READ fingerDetection)
-
public Q_SLOTS:
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpad.h synaptiks-0.3.2/src/daemon/touchpad.h
--- src/daemon/touchpad.h 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpad.h 2010-03-29 22:05:27.146508808 +0200
@@ -33,2 +33,3 @@
#include "qxdevice.h"
+#include
#include
@@ -130,2 +131,3 @@ namespace synaptiks {
* @code
+ *
* Touchpad *touchpad = Touchpad::findTouchpad(parent);
@@ -161,3 +163,3 @@ namespace synaptiks {
*/
- class Touchpad: public QObject {
+ class Touchpad: public QObject, public QDBusContext {
Q_OBJECT
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org