[mate-settings-daemon] 01/02: Revert "debian/patches: Add missing patch messed up by @gnugr."

[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 a7f27b75197d12f1b32983f5510ff39eaf0563b8
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Sun Oct 22 18:02:10 2017 +0300

    Revert "debian/patches: Add missing patch messed up by @gnugr."
    
    This reverts commit 1b25f9cac7ffdbf380823b48b9dade726316d921.
    
    	deleted:    debian/patches/1001_request_keyboard_event_from_global_keybindings.diff
    	modified:   debian/patches/series
---
 ...est_keyboard_event_from_global_keybindings.diff | 27 ----------------------
 debian/patches/series                              |  3 ---
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/1001_request_keyboard_event_from_global_keybindings.diff b/debian/patches/1001_request_keyboard_event_from_global_keybindings.diff
deleted file mode 100644
index e6e7275..0000000
--- a/debian/patches/1001_request_keyboard_event_from_global_keybindings.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/plugins/keybindings/msd-keybindings-manager.c b/plugins/keybindings/msd-keybindings-manager.c
-index 89ae0bc..f2a1c00 100644
---- a/plugins/keybindings/msd-keybindings-manager.c
-+++ b/plugins/keybindings/msd-keybindings-manager.c
-@@ -538,6 +538,7 @@ msd_keybindings_manager_start (MsdKeybindingsManager *manager,
- {
-         GdkDisplay  *dpy;
-         GdkScreen   *screen;
-+        GdkWindow   *window;
-         int          screen_num;
-         int          i;
- 
-@@ -549,9 +550,13 @@ msd_keybindings_manager_start (MsdKeybindingsManager *manager,
- 
-         for (i = 0; i < screen_num; i++) {
-                 screen = gdk_display_get_screen (dpy, i);
--                gdk_window_add_filter (gdk_screen_get_root_window (screen),
-+                window = gdk_screen_get_root_window(screen);
-+                gdk_window_add_filter (window,
-                                        (GdkFilterFunc) keybindings_filter,
-                                        manager);
-+                gdk_error_trap_push ();
-+                XSelectInput(GDK_DISPLAY_XDISPLAY(dpy), GDK_WINDOW_XID(window), KeyPressMask);
-+                gdk_error_trap_pop_ignored ();
-         }
-         manager->priv->screens = get_screens_list ();
- 
diff --git a/debian/patches/series b/debian/patches/series
index a0bf22a..88a755a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
 1000_global_menu_support.diff
 1001_request_keyboard_event_from_global_keybindings.diff
-<<<<<<< HEAD
 1002_fix-randr-applet-dying-on-restart.patch
 
-=======
->>>>>>> cd058f2... debian/patches: Add 1001_request_keyboard_event_from_global_keybindings.diff. This allows mate-settings-daemon to honor global keybindings whenever a different application has keybindings that seem conflicting, but are usually not.

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