Skip to content
Commits on Source (3)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 44899837
mate-panel (1.22.1-2) unstable; urgency=medium
* debian/patches:
+ Rebase patches 0003, 0004, 0005.
+ Add 0006_Fix-panel-applet-keyboard-focus-trap.patch. (Closes: #933714).
-- Mike Gabriel <sunweaver@debian.org> Fri, 02 Aug 2019 18:28:19 +0200
mate-panel (1.22.1-1) unstable; urgency=medium
[ Martin Wimpress ]
......
debian/patches/0003_configure.ac-Report-RDA-support-status-in-configurat.patch
View file @ 44899837
......@@ -8,11 +8,9 @@ Subject: [PATCH] configure.ac: Report RDA support status in configuration
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index c6c61c3b..5b0ba29f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,6 +372,7 @@ echo "
@@ -371,6 +371,7 @@
Wayland support: ${have_wayland}
X11 support: ${have_x11}
XRandr support: ${have_randr}
......
debian/patches/0004_configure.ac-Explicitly-require-in-RDA-0.0.3.patch
View file @ 44899837
......@@ -7,11 +7,9 @@ Subject: [PATCH] configure.ac: Explicitly require in RDA >= 0.0.3.
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a41a93c..cbdc149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ LIBRSVG_REQUIRED=2.36.2
@@ -65,6 +65,7 @@
GTK_REQUIRED=3.22.0
LIBWNCK_REQUIRED=3.4.6
WEATHER_REQUIRED=1.17.0
......@@ -19,7 +17,7 @@ index a41a93c..cbdc149 100644
dnl pkg-config dependency checks
@@ -204,7 +205,7 @@ fi
@@ -235,7 +236,7 @@
dnl Remote Desktop Awareness
......@@ -28,6 +26,3 @@ index a41a93c..cbdc149 100644
if test "x$have_rda" = "xyes"; then
AC_DEFINE(HAVE_RDA, 1, [Have the Remote Desktop Awareness library])
fi
--
2.11.0
debian/patches/0005_fix_panel_resets.patch
View file @ 44899837
Author: Vlad Orlov
Description: FIx random panel crashes on reset.
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
index 15cf114e..7d787755 100644
--- a/mate-panel/panel-profile.c
+++ b/mate-panel/panel-profile.c
@@ -1029,16 +1029,6 @@ panel_profile_delete_toplevel (PanelToplevel *toplevel)
@@ -1029,16 +1029,6 @@
toplevel_id = panel_profile_get_toplevel_id (toplevel);
......@@ -22,7 +20,7 @@ index 15cf114e..7d787755 100644
panel_profile_delete_toplevel_objects (toplevel_id);
panel_profile_remove_from_list (PANEL_GSETTINGS_TOPLEVELS, toplevel_id);
@@ -1445,6 +1435,18 @@ panel_profile_delete_removed_ids (PanelGSettingsKeyType type,
@@ -1445,6 +1435,18 @@
g_slist_free (removed_ids);
}
......@@ -41,7 +39,7 @@ index 15cf114e..7d787755 100644
static void
panel_profile_toplevel_id_list_notify (GSettings *settings,
gchar *key,
@@ -1487,7 +1489,7 @@ panel_profile_toplevel_id_list_notify (GSettings *settings,
@@ -1487,7 +1489,7 @@
/* if there are no panels, reset layout to default */
if (g_slist_length (toplevel_ids) == 0)
......@@ -50,11 +48,9 @@ index 15cf114e..7d787755 100644
g_slist_free (existing_toplevels);
g_slist_free (toplevel_ids);
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index ab203a66..5d43870e 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -246,6 +246,8 @@ static void panel_toplevel_calculate_animation_end_geometry(PanelToplevel *tople
@@ -246,6 +246,8 @@
static void panel_toplevel_update_monitor(PanelToplevel* toplevel);
static void panel_toplevel_set_monitor_internal(PanelToplevel* toplevel, int monitor, gboolean force_resize);
......@@ -63,7 +59,7 @@ index ab203a66..5d43870e 100644
static void
update_style_classes (PanelToplevel *toplevel)
{
@@ -3072,6 +3074,37 @@ panel_toplevel_dispose (GObject *widget)
@@ -3102,6 +3104,37 @@
{
PanelToplevel *toplevel = (PanelToplevel *) widget;
......@@ -101,7 +97,7 @@ index ab203a66..5d43870e 100644
if (toplevel->priv->attached) {
panel_toplevel_disconnect_attached (toplevel);
toplevel->priv->attached = FALSE;
@@ -3080,6 +3113,16 @@ panel_toplevel_dispose (GObject *widget)
@@ -3110,6 +3143,16 @@
toplevel->priv->attach_widget = NULL;
}
......@@ -118,7 +114,7 @@ index ab203a66..5d43870e 100644
panel_toplevel_disconnect_timeouts (toplevel);
G_OBJECT_CLASS (panel_toplevel_parent_class)->dispose (widget);
@@ -4218,47 +4261,6 @@ panel_toplevel_finalize (GObject *object)
@@ -4252,47 +4295,6 @@
toplevel_list = g_slist_remove (toplevel_list, toplevel);
......
debian/patches/0006_Fix-panel-applet-keyboard-focus-trap.patch 0 → 100644
View file @ 44899837
From a2cdef91974fbe83995791e98f19ed58ec04a43c Mon Sep 17 00:00:00 2001
From: lukefromdc <lukefromdc@hushmail.com>
Date: Mon, 6 May 2019 02:04:12 -0400
Subject: [PATCH] Fix panel applet keyboard focus trap
Do not open the context menu on tab-or on anything but the menu key. Note that Return must be used by some applets (e.g. the clock) for something else
---
libmate-panel-applet/mate-panel-applet.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index d7d510e..e98fc08 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -985,13 +985,19 @@ mate_panel_applet_button_release (GtkWidget *widget,
return mate_panel_applet_button_event (applet, event);
}
+/*Open the applet context menu only on Menu key
+ *Do not open it on Return or some applets won't work
+ */
static gboolean
mate_panel_applet_key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
- mate_panel_applet_menu_popup (MATE_PANEL_APPLET (widget), (GdkEvent *) event);
-
- return TRUE;
+ if (event->keyval == GDK_KEY_Menu) {
+ mate_panel_applet_menu_popup (MATE_PANEL_APPLET (widget), (GdkEvent *) event);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
static void
--
2.20.1
debian/patches/series
View file @ 44899837
......@@ -3,3 +3,4 @@
0003_configure.ac-Report-RDA-support-status-in-configurat.patch
0004_configure.ac-Explicitly-require-in-RDA-0.0.3.patch
0005_fix_panel_resets.patch
0006_Fix-panel-applet-keyboard-focus-trap.patch