[mate-settings-daemon] 02/03: debian/patches: Drop 1002_fix-randr-applet-dying-on-restart.patch. Applied upstream.

[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 134c539700070ba467bf1ed50dae8720a99714a3
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Fri Oct 27 01:24:17 2017 +0300

    debian/patches: Drop 1002_fix-randr-applet-dying-on-restart.patch. Applied upstream.
---
 .../1002_fix-randr-applet-dying-on-restart.patch   | 52 ----------------------
 debian/patches/series                              |  2 +-
 2 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/debian/patches/1002_fix-randr-applet-dying-on-restart.patch b/debian/patches/1002_fix-randr-applet-dying-on-restart.patch
deleted file mode 100644
index 0b37b7f..0000000
--- a/debian/patches/1002_fix-randr-applet-dying-on-restart.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 6acb3f4..cd109e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 1000_global_menu_support.diff
-1002_fix-randr-applet-dying-on-restart.patch
+
 

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