Commit 2bac3732 authored by Bruguier Nicolas's avatar Bruguier Nicolas

debian/patches/fix-gnome-3.20-support.patch:

  - Fix crash with gnome 3.20
parent 99e1f81c
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
switchboard-plug-mouse-touchpad (0.1.1+testing+bzr67-0+pantheon1) unstable; urgency=medium
.
* New snapshot release.
Author: gandalfn <gandalfn@club-internet.fr>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: switchboard-plug-mouse-touchpad/src/Backend/TouchpadSettings.vala
===================================================================
--- switchboard-plug-mouse-touchpad.orig/src/Backend/TouchpadSettings.vala
+++ switchboard-plug-mouse-touchpad/src/Backend/TouchpadSettings.vala
@@ -22,7 +22,7 @@ public class MouseTouchpad.Backend.Touch
public string click_method { get; set; }
public double speed { get; set; }
public string left_handed { get; set; }
- public string scroll_method { get; set; }
+ public bool edge_scrolling_enabled { get; set; }
public bool natural_scroll { get; set; }
public bool disable_while_typing { get; set; }
Index: switchboard-plug-mouse-touchpad/src/Widgets/TouchpadSection.vala
===================================================================
--- switchboard-plug-mouse-touchpad.orig/src/Widgets/TouchpadSection.vala
+++ switchboard-plug-mouse-touchpad/src/Widgets/TouchpadSection.vala
@@ -66,10 +66,8 @@ public class MouseTouchpad.Widgets.Touch
pointer_speed_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
Plug.end_size_group.add_widget (pointer_speed_scale);
- var scrolling_combobox = new Gtk.ComboBoxText ();
- scrolling_combobox.append ("two-finger-scrolling", _("Two-finger"));
- scrolling_combobox.append ("edge-scrolling", _("Edge"));
- scrolling_combobox.append ("disabled", _("Disabled"));
+ var edge_scrolling_switch = new Gtk.Switch ();
+ edge_scrolling_switch.halign = Gtk.Align.START;
var horizontal_scrolling_switch = new Gtk.Switch ();
horizontal_scrolling_switch.halign = Gtk.Align.START;
@@ -88,8 +86,8 @@ public class MouseTouchpad.Widgets.Touch
attach (new SettingLabel (_("Physical clicking:")), 0, 3, 1, 1);
attach (click_method_switch, 1, 3, 1, 1);
attach (click_method_combobox, 2, 3, 1, 1);
- attach (new SettingLabel (_("Scrolling:")), 0, 4, 1, 1);
- attach (scrolling_combobox, 1, 4, 2, 1);
+ attach (new SettingLabel (_("Edge scrolling:")), 0, 4, 1, 1);
+ attach (edge_scrolling_switch, 1, 4, 2, 1);
attach (new SettingLabel (_("Natural scrolling:")), 0, 5, 1, 1);
attach (natural_scrolling_switch, 1, 5, 1, 1);
attach (new SettingLabel (_("Disable while typing:")), 0, 6, 1, 1);
@@ -105,20 +103,9 @@ public class MouseTouchpad.Widgets.Touch
}
});
- scrolling_combobox.changed.connect (() => {
- string active_text = scrolling_combobox.get_active_id ();
- if (active_text == "disabled") {
- horizontal_scrolling_switch.sensitive = false;
- natural_scrolling_switch.sensitive = false;
- } else {
- horizontal_scrolling_switch.sensitive = true;
- natural_scrolling_switch.sensitive = true;
- }
- });
-
- touchpad_settings.bind_property ("scroll-method",
- scrolling_combobox,
- "active-id",
+ touchpad_settings.bind_property ("edge-scrolling-enabled",
+ edge_scrolling_switch,
+ "state",
BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
touchpad_settings.bind_property ("tap-to-click",
fix-gnome-3.20-support.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment