Skip to content
Snippets Groups Projects
Commit fdbbc48f authored by Sebastien Bacher's avatar Sebastien Bacher
Browse files

New upstream release

parent 34df9ece
No related branches found
No related tags found
No related merge requests found
gnome-control-center (1:3.37.3-1) UNRELEASED; urgency=medium
* New upstream release
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 07 Aug 2020 17:36:45 +0200
gnome-control-center (1:3.36.4-1) unstable; urgency=medium
* New upstream release (lp: #1886495)
......
......@@ -20,11 +20,11 @@ https://gitlab.gnome.org/GNOME/mutter/merge_requests/37
panels/mouse/cc-mouse-panel.c | 16 +++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/panels/mouse/cc-mouse-caps-helper.c b/panels/mouse/cc-mouse-caps-helper.c
index 69546b2b6..39534b912 100644
--- a/panels/mouse/cc-mouse-caps-helper.c
+++ b/panels/mouse/cc-mouse-caps-helper.c
@@ -38,6 +38,13 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
Index: gnome-control-center/panels/mouse/cc-mouse-caps-helper.c
===================================================================
--- gnome-control-center.orig/panels/mouse/cc-mouse-caps-helper.c
+++ gnome-control-center/panels/mouse/cc-mouse-caps-helper.c
@@ -38,6 +38,13 @@ touchpad_check_capabilities_x11 (gboolea
unsigned long nitems, bytes_after;
unsigned char *data;
......@@ -38,11 +38,11 @@ index 69546b2b6..39534b912 100644
gdisplay = gdk_display_get_default ();
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False);
diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c
index df2cd4b7a..a90062f72 100644
--- a/panels/mouse/cc-mouse-panel.c
+++ b/panels/mouse/cc-mouse-panel.c
@@ -72,7 +72,6 @@ struct _CcMousePanel
Index: gnome-control-center/panels/mouse/cc-mouse-panel.c
===================================================================
--- gnome-control-center.orig/panels/mouse/cc-mouse-panel.c
+++ gnome-control-center/panels/mouse/cc-mouse-panel.c
@@ -68,7 +68,6 @@ struct _CcMousePanel
gboolean have_mouse;
gboolean have_touchpad;
gboolean have_touchscreen;
......@@ -50,7 +50,7 @@ index df2cd4b7a..a90062f72 100644
gboolean left_handed;
GtkGesture *left_gesture;
@@ -90,7 +89,7 @@ setup_touchpad_options (CcMousePanel *self)
@@ -86,7 +85,7 @@ setup_touchpad_options (CcMousePanel *se
gboolean have_edge_scrolling;
gboolean have_tap_to_click;
......@@ -59,9 +59,9 @@ index df2cd4b7a..a90062f72 100644
gtk_widget_hide (GTK_WIDGET (self->touchpad_frame));
return;
}
@@ -314,7 +313,10 @@ device_changed (GsdDeviceManager *device_manager,
GsdDevice *device,
CcMousePanel *self)
@@ -308,7 +307,10 @@ setup_dialog (CcMousePanel *self)
static void
device_changed (CcMousePanel *self)
{
- self->have_touchpad = touchpad_is_present ();
+ self->have_touchpad = touchpad_is_present () || cc_synaptics_check ();
......@@ -71,8 +71,8 @@ index df2cd4b7a..a90062f72 100644
setup_touchpad_options (self);
@@ -409,11 +411,11 @@ cc_mouse_panel_init (CcMousePanel *self)
G_CALLBACK (device_changed), self);
@@ -397,11 +399,11 @@ cc_mouse_panel_init (CcMousePanel *self)
G_CALLBACK (device_changed), self, G_CONNECT_SWAPPED);
self->have_mouse = mouse_is_present ();
- self->have_touchpad = touchpad_is_present ();
......@@ -87,6 +87,3 @@ index df2cd4b7a..a90062f72 100644
setup_dialog (self);
}
--
2.25.1
......@@ -7,13 +7,13 @@ This reverts commit 9ebcd17236a54daa0927a22d973d0309dfb4c8df.
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gnome-control-center-3.36.2/meson.build
Index: gnome-control-center/meson.build
===================================================================
--- gnome-control-center-3.36.2.orig/meson.build
+++ gnome-control-center-3.36.2/meson.build
--- gnome-control-center.orig/meson.build
+++ gnome-control-center/meson.build
@@ -128,7 +128,7 @@ gnome_settings_dep = dependency('gnome-s
goa_dep = dependency('goa-1.0', version: goa_req_version)
gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0')
gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.37.1')
libxml_dep = dependency('libxml-2.0')
-polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114')
+polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment