[marco] 02/03: add forgotten file from last upload

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository marco.

commit f1c1f32294a780de2f3851c8f2f7245afdd3f184
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 25 01:49:42 2014 +0200

    add forgotten file from last upload
---
 ...workspace-when-switching-to-sticky-window.patch | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/debian/patches/0004_dont-switch-workspace-when-switching-to-sticky-window.patch b/debian/patches/0004_dont-switch-workspace-when-switching-to-sticky-window.patch
new file mode 100644
index 0000000..7d9f53b
--- /dev/null
+++ b/debian/patches/0004_dont-switch-workspace-when-switching-to-sticky-window.patch
@@ -0,0 +1,40 @@
+From 0ee6f6db3f405c13c88f75760f88296560cf9fd6 Mon Sep 17 00:00:00 2001
+From: Denis Gorodnichev <denis.gorodnichev at gmail.com>
+Date: Sat, 28 Jun 2014 16:58:28 +0000
+Subject: don't switch workspace when switching to sticky window
+
+Closes https://github.com/mate-desktop/marco/pull/121
+Closes https://github.com/mate-desktop/marco/issues/18
+---
+--- a/src/core/keybindings.c
++++ b/src/core/keybindings.c
+@@ -2031,7 +2031,8 @@
+                       target_window->desc);
+           display->mouse_mode = FALSE;
+           meta_window_activate (target_window, event->xkey.time);
+-          meta_workspace_activate (target_window->workspace, event->xkey.time);
++          if (!target_window->on_all_workspaces)
++            meta_workspace_activate (target_window->workspace, event->xkey.time);
+ 
+           meta_topic (META_DEBUG_KEYBINDINGS,
+                       "Ending grab early so we can focus the target window\n");
+@@ -2897,7 +2898,8 @@
+                       initial_selection->desc);
+           display->mouse_mode = FALSE;
+           meta_window_activate (initial_selection, event->xkey.time);
+-          meta_workspace_activate (initial_selection->workspace, event->xkey.time);
++          if (!initial_selection->on_all_workspaces)
++            meta_workspace_activate (initial_selection->workspace, event->xkey.time);
+         }
+       else if (meta_display_begin_grab_op (display,
+                                            screen,
+@@ -2927,7 +2929,8 @@
+               meta_display_end_grab_op (display, event->xkey.time);
+               display->mouse_mode = FALSE;
+               meta_window_activate (initial_selection, event->xkey.time);
+-              meta_workspace_activate (initial_selection->workspace, event->xkey.time);
++              if (!initial_selection->on_all_workspaces)
++                meta_workspace_activate (initial_selection->workspace, event->xkey.time);
+             }
+           else
+             {

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