[mate-settings-daemon] 01/02: debian/control: Bump Standards-Version: to 4.1.1. No changes needed.

[Vangelis Mouhtsis]

This is an automated email from the git hooks/post-receive script.

gnugr-guest pushed a commit to branch parrot/3.7
in repository mate-settings-daemon.

commit 1b7f184121a6354b128f8e194ed278763cc46130
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 17 17:51:43 2017 +0200

    debian/control: Bump Standards-Version: to 4.1.1. No changes needed.
---
 debian/control                                     |  2 +-
 .../1002_fix-randr-applet-dying-on-restart.patch   | 52 ++++++++++++++++++++++
 debian/patches/series                              |  6 +++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ddbcbc2..c74a91f 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends: autotools-dev,
                libxt-dev,
                mate-common (>= 1.18),
                x11proto-kb-dev,
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-mate/mate-settings-daemon.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-mate/mate-settings-daemon.git
diff --git a/debian/patches/1002_fix-randr-applet-dying-on-restart.patch b/debian/patches/1002_fix-randr-applet-dying-on-restart.patch
new file mode 100644
index 0000000..0b37b7f
--- /dev/null
+++ b/debian/patches/1002_fix-randr-applet-dying-on-restart.patch
@@ -0,0 +1,52 @@
+From 603e331e6cf480d2f9aed1e7d096333df39215aa Mon Sep 17 00:00:00 2001
+From: Victor Kareh <vkareh at vkareh.net>
+Date: Mon, 26 Jun 2017 14:11:19 -0400
+Subject: [PATCH] Fix Xrandr applet dying on restart
+
+When setting `KeyPressMask` as a reportable event for all windows, the
+keybinding for `Fn+F7` in Xrandr seems to fail. This change adds, rather
+than overrides, the `KeyPressMask` as a reportable event for the
+corresponding window.
+
+Fixes #180
+---
+ plugins/keybindings/msd-keybindings-manager.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/keybindings/msd-keybindings-manager.c b/plugins/keybindings/msd-keybindings-manager.c
+index f2a1c00..c022547 100644
+--- a/plugins/keybindings/msd-keybindings-manager.c
++++ b/plugins/keybindings/msd-keybindings-manager.c
+@@ -541,21 +541,30 @@ msd_keybindings_manager_start (MsdKeybindingsManager *manager,
+         GdkWindow   *window;
+         int          screen_num;
+         int          i;
++        Display     *xdpy;
++        Window       xwindow;
++        XWindowAttributes atts;
+ 
+         g_debug ("Starting keybindings manager");
+         mate_settings_profile_start (NULL);
+ 
+         dpy = gdk_display_get_default ();
++        xdpy = GDK_DISPLAY_XDISPLAY (dpy);
+         screen_num = gdk_display_get_n_screens (dpy);
+ 
+         for (i = 0; i < screen_num; i++) {
+                 screen = gdk_display_get_screen (dpy, i);
+-                window = gdk_screen_get_root_window(screen);
++                window = gdk_screen_get_root_window (screen);
++                xwindow = GDK_WINDOW_XID (window);
++
+                 gdk_window_add_filter (window,
+                                        (GdkFilterFunc) keybindings_filter,
+                                        manager);
++
+                 gdk_error_trap_push ();
+-                XSelectInput(GDK_DISPLAY_XDISPLAY(dpy), GDK_WINDOW_XID(window), KeyPressMask);
++                /* Add KeyPressMask to the currently reportable event masks */
++                XGetWindowAttributes (xdpy, xwindow, &atts);
++                XSelectInput (xdpy, xwindow, atts.your_event_mask | KeyPressMask);
+                 gdk_error_trap_pop_ignored ();
+         }
+         manager->priv->screens = get_screens_list ();
diff --git a/debian/patches/series b/debian/patches/series
index c36d04f..fc9588e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,7 @@
 1000_global_menu_support.diff
+<<<<<<< HEAD
+=======
+1001_request_keyboard_event_from_global_keybindings.diff
+1002_fix-randr-applet-dying-on-restart.patch
+
+>>>>>>> f0f347a... debian/patches: Add 1002_fix-randr-applet-dying-on-restart.patch. Complete the fix started in 1001_request_keyboard_event_from_global_keybindings.diff.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-settings-daemon.git