diff -Nru gnome-shell-3.28.3/debian/changelog gnome-shell-3.28.3/debian/changelog --- gnome-shell-3.28.3/debian/changelog 2018-08-03 06:18:24.000000000 +0000 +++ gnome-shell-3.28.3/debian/changelog 2018-11-06 17:49:17.000000000 +0000 @@ -1,3 +1,16 @@ +gnome-shell (3.28.3-0ubuntu0.18.04.3) bionic; urgency=medium + + * debian/ubuntu.css: + - use defined color for menu separators (LP: #1739931) + - set StEntry minimun height to work properly with Ubuntu font (LP: #1743058) + * debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch: + - Don't emit two click events on touch under X11 (LP: #1745888) + * d/p/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch, + d/p/st-scroll-view-Remove-scrollbars-references-on-dispose.patch: + - Handle NULL scroll bars in st-scroll-view (LP: #1725312) + + -- Marco Trevisan (Treviño) Tue, 06 Nov 2018 17:49:17 +0000 + gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium * New upstream release (LP: #1718931, LP: #1782614) diff -Nru gnome-shell-3.28.3/debian/patches/series gnome-shell-3.28.3/debian/patches/series --- gnome-shell-3.28.3/debian/patches/series 2018-08-03 06:18:24.000000000 +0000 +++ gnome-shell-3.28.3/debian/patches/series 2018-11-06 17:49:17.000000000 +0000 @@ -22,3 +22,6 @@ authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch gdm-util-Always-allow-to-retry-login-in-unlock-mode.patch popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch +st-button-Ignore-pointer-emulated-touch-events.patch +st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch +st-scroll-view-Remove-scrollbars-references-on-dispose.patch diff -Nru gnome-shell-3.28.3/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch gnome-shell-3.28.3/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch --- gnome-shell-3.28.3/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-3.28.3/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch 2018-11-06 17:49:17.000000000 +0000 @@ -0,0 +1,42 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Thu, 25 Oct 2018 06:35:25 +0200 +Subject: st-button: Ignore pointer emulated touch events + +In X11, pointer emulated touch events are replicated with normal PRESS, RELEASE +pair events which are generated by the server. Thus for a single tap we get: + - TOUCH_BEGIN -> TOUCH_END, PRESS -> RELEASE + +This will cause st-button to send two "clicked" signals, instead of just one, +breaking extensions (like dash-to-dock) that show buttons in the main stage +which will be checked two times or that will receive the same signal two times. + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888 +Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/272 +--- + src/st/st-button.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/st/st-button.c b/src/st/st-button.c +index 8f5c492..a3a7b24 100644 +--- a/src/st/st-button.c ++++ b/src/st/st-button.c +@@ -248,14 +248,17 @@ st_button_touch_event (ClutterActor *actor, + if (event->type == CLUTTER_TOUCH_BEGIN && !priv->press_sequence) + { + clutter_input_device_sequence_grab (device, sequence, actor); +- st_button_press (button, device, 0, sequence); ++ if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event)) ++ st_button_press (button, device, 0, sequence); + return CLUTTER_EVENT_STOP; + } + else if (event->type == CLUTTER_TOUCH_END && + priv->device == device && + priv->press_sequence == sequence) + { +- st_button_release (button, device, mask, 0, sequence); ++ if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event)) ++ st_button_release (button, device, mask, 0, sequence); ++ + clutter_input_device_sequence_ungrab (device, sequence); + return CLUTTER_EVENT_STOP; + } diff -Nru gnome-shell-3.28.3/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch gnome-shell-3.28.3/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch --- gnome-shell-3.28.3/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-3.28.3/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch 2018-11-06 17:49:17.000000000 +0000 @@ -0,0 +1,38 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Fri, 3 Aug 2018 18:51:24 +0200 +Subject: st/scroll-view: Handle the case where scrollbars are NULL + +The scrollbars actors in a scroll view can be NULL, in case they get removed +with a call to `clutter_actor_remove_child` on a scroll-view (and this is +implemented in st_scroll_view_remove). + +So, we should support the case where `priv->{h,v}scroll` are NULL, not to crash +in `st_widget_style_changed`. + +Fixes #467 + +Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/467 +BUG-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1725312 +Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190 +--- + src/st/st-scroll-view.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c +index fc0db1c..a8b6d2e 100644 +--- a/src/st/st-scroll-view.c ++++ b/src/st/st-scroll-view.c +@@ -741,8 +741,11 @@ st_scroll_view_style_changed (StWidget *widget) + gdouble hfade_offset = st_theme_node_get_length (theme_node, "-st-hfade-offset"); + st_scroll_view_update_fade_effect (self, vfade_offset, hfade_offset); + +- st_widget_style_changed (ST_WIDGET (priv->hscroll)); +- st_widget_style_changed (ST_WIDGET (priv->vscroll)); ++ if (priv->hscroll) ++ st_widget_style_changed (ST_WIDGET (priv->hscroll)); ++ ++ if (priv->vscroll) ++ st_widget_style_changed (ST_WIDGET (priv->vscroll)); + + ST_WIDGET_CLASS (st_scroll_view_parent_class)->style_changed (widget); + } diff -Nru gnome-shell-3.28.3/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch gnome-shell-3.28.3/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch --- gnome-shell-3.28.3/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-3.28.3/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch 2018-11-06 17:49:17.000000000 +0000 @@ -0,0 +1,33 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= +Date: Fri, 3 Aug 2018 19:06:47 +0200 +Subject: st/scroll-view: Remove scrollbars references on dispose + +As we're destroying the scrollbars on destruction, we should remove any +reference of it, not to cause multiple-calls to disposal to unreference them +again. + +Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/467 +BUG-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1725312 +Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190 +--- + src/st/st-scroll-view.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c +index a8b6d2e..cb38aef 100644 +--- a/src/st/st-scroll-view.c ++++ b/src/st/st-scroll-view.c +@@ -244,11 +244,8 @@ st_scroll_view_dispose (GObject *object) + priv->fade_effect = NULL; + } + +- if (priv->vscroll) +- clutter_actor_destroy (priv->vscroll); +- +- if (priv->hscroll) +- clutter_actor_destroy (priv->hscroll); ++ g_clear_pointer (&priv->vscroll, clutter_actor_destroy); ++ g_clear_pointer (&priv->hscroll, clutter_actor_destroy); + + /* For most reliable freeing of memory, an object with signals + * like StAdjustment should be explicitly disposed. Since we own diff -Nru gnome-shell-3.28.3/debian/ubuntu-session-mods/ubuntu.css gnome-shell-3.28.3/debian/ubuntu-session-mods/ubuntu.css --- gnome-shell-3.28.3/debian/ubuntu-session-mods/ubuntu.css 2018-08-03 06:18:24.000000000 +0000 +++ gnome-shell-3.28.3/debian/ubuntu-session-mods/ubuntu.css 2018-11-06 17:49:17.000000000 +0000 @@ -519,7 +519,7 @@ height: 1px; margin: 6px 64px; background-color: transparent; - border-color: #3a3a34; + border-color: #2c2c28; border-bottom-width: 1px; border-bottom-style: solid; } @@ -1911,6 +1911,11 @@ font-family: Ubuntu, Cantarell, Sans-Serif; } +/* Set minimum height as per Ubuntu font usage, fixes password entries (LP: #1743058) */ +StEntry { + min-height: 19px; +} + /* switch colors */ .toggle-switch-us:checked { background-image: url("ubuntu-toggle-on-us.svg");