update to 1.12.1 release

This commit is contained in:
Wolfgang Ulbrich 2015-12-30 01:04:38 +01:00
parent 15f8422335
commit 53ca5adea3
4 changed files with 12 additions and 93 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/mate-settings-daemon-1.8.3.tar.xz
/mate-settings-daemon-1.10.1.tar.xz
/mate-settings-daemon-1.10.2.tar.xz
/mate-settings-daemon-1.12.1.tar.xz

View File

@ -2,7 +2,7 @@
%global rel_build 1
# This is needed, because src-url contains branched part of versioning-scheme.
%global branch 1.10
%global branch 1.12
# Settings used for build from snapshots.
%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
@ -13,9 +13,9 @@
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
Name: mate-settings-daemon
Version: %{branch}.2
Version: %{branch}.1
%if 0%{?rel_build}
Release: 2%{?dist}
Release: 1%{?dist}
%else
Release: 0.1%{?git_rel}%{?dist}
%endif
@ -31,9 +31,6 @@ URL: http://mate-desktop.org
# fix rhbz (#1140329)
Patch0: mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=ed55854
# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=33cb903
Patch1: mate-settings-daemon_touchpad.patch
BuildRequires: dbus-glib-devel
BuildRequires: dconf-devel
@ -75,7 +72,6 @@ under it.
%setup -q
%patch0 -p1 -b .xrdb
%patch1 -p1 -b .touchpad
%if 0%{?rel_build}
#NOCONFIGURE=1 ./autogen.sh
@ -112,17 +108,20 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae
%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
/bin/touch --no-create %{_datadir}/hicolor/mate &> /dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
@ -141,6 +140,7 @@ fi
%{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
%{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
%{_datadir}/icons/mate/*/*/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/mate-settings-daemon
%{_datadir}/glib-2.0/schemas/org.mate.*.xml
%{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
@ -152,6 +152,9 @@ fi
%changelog
* Sun Dec 27 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-1
- update to 1.12.1 release
* Wed Nov 25 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2-2
- rebuild for 7.2 upgrade

View File

@ -1,85 +0,0 @@
diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in.in b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
index 8a30d1f..a7f5d05 100644
--- a/data/org.mate.peripherals-touchpad.gschema.xml.in.in
+++ b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
@@ -25,5 +25,20 @@
<_summary>Enable touchpad</_summary>
<_description>Set this to TRUE to enable all touchpads.</_description>
</key>
+ <key name="tap-button-one-finger" type="i">
+ <default>1</default>
+ <_summary>One finger tap button</_summary>
+ <_description>Select the button mapping for one-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
+ </key>
+ <key name="tap-button-two-finger" type="i">
+ <default>2</default>
+ <_summary>Two finger tap button</_summary>
+ <_description>Select the button mapping for two-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
+ </key>
+ <key name="tap-button-three-finger" type="i">
+ <default>3</default>
+ <_summary>Three finger tap button</_summary>
+ <_description>Select the button mapping for three-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
+ </key>
</schema>
</schemalist>
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index 426697f..6133d2d 100644
--- a/plugins/mouse/msd-mouse-manager.c
+++ b/plugins/mouse/msd-mouse-manager.c
@@ -62,6 +62,9 @@
#define KEY_TOUCHPAD_DISABLE_W_TYPING "disable-while-typing"
#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
#define KEY_TOUCHPAD_TAP_TO_CLICK "tap-to-click"
+#define KEY_TOUCHPAD_ONE_FINGER_TAP "tap-button-one-finger"
+#define KEY_TOUCHPAD_TWO_FINGER_TAP "tap-button-two-finger"
+#define KEY_TOUCHPAD_THREE_FINGER_TAP "tap-button-three-finger"
#define KEY_TOUCHPAD_SCROLL_METHOD "scroll-method"
#define KEY_TOUCHPAD_PAD_HORIZ_SCROLL "horiz-scroll-enabled"
#define KEY_TOUCHPAD_ENABLED "touchpad-enabled"
@@ -673,13 +676,25 @@ set_tap_to_click (gboolean state, gboolean left_handed)
rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device, prop, 0, 2,
False, XA_INTEGER, &type, &format, &nitems,
&bytes_after, &data);
+
+ GSettings *settings = g_settings_new (MATE_TOUCHPAD_SCHEMA);
+ gint one_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_ONE_FINGER_TAP);
+ gint two_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_TWO_FINGER_TAP);
+ gint three_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_THREE_FINGER_TAP);
+ if (one_finger_tap > 3 || one_finger_tap < 1)
+ one_finger_tap = 1;
+ if (two_finger_tap > 3 || two_finger_tap < 1)
+ two_finger_tap = 2;
+ if (three_finger_tap > 3 || three_finger_tap < 1)
+ three_finger_tap = 3;
+ g_object_unref (settings);
if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7)
{
/* Set RLM mapping for 1/2/3 fingers*/
- data[4] = (state) ? ((left_handed) ? 3 : 1) : 0;
- data[5] = (state) ? ((left_handed) ? 1 : 3) : 0;
- data[6] = (state) ? 2 : 0;
+ data[4] = (state) ? ((left_handed) ? (4-one_finger_tap) : one_finger_tap) : 0;
+ data[5] = (state) ? ((left_handed) ? (4-two_finger_tap) : two_finger_tap) : 0;
+ data[6] = (state) ? three_finger_tap : 0;
XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device, prop, XA_INTEGER, 8,
PropModeReplace, data, nitems);
}
@@ -1000,6 +1015,15 @@ mouse_callback (GSettings *settings,
} else if (g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0) {
set_tap_to_click (g_settings_get_boolean (settings, key),
g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0) {
+ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
+ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_TAP) == 0) {
+ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
+ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_TAP) == 0) {
+ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
+ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
} else if (g_strcmp0 (key, KEY_TOUCHPAD_SCROLL_METHOD) == 0) {
set_edge_scroll (g_settings_get_int (settings, key));
set_horiz_scroll (g_settings_get_boolean (settings, KEY_TOUCHPAD_PAD_HORIZ_SCROLL));

View File

@ -1 +1 @@
d578476039fb8c1b2c47ed6873617700 mate-settings-daemon-1.10.2.tar.xz
caf768f8bd13b35bab9d40ee5a0199c1 mate-settings-daemon-1.12.1.tar.xz