From a513603dff11e03d6fc78881a2717efd0f8db189 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Thu, 10 Mar 2011 16:52:22 +0000
Subject: [PATCH] e17: on _NET_ACTIVE_WINDOW client message: only switch to
 desk if border is not sticky

SVN revision: 57676
---
 src/bin/e_manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index b7a9b9a3b..ac5772f91 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -965,7 +965,8 @@ _e_manager_cb_client_message(void *data __UNUSED__, int ev_type __UNUSED__, void
 		       if (!bd->lock_user_iconify)
 			 e_border_uniconify(bd);
 		    }
-		  if (!bd->iconic) e_desk_show(bd->desk);
+		  if ((!bd->iconic) && (!bd->sticky))
+		    e_desk_show(bd->desk);
 		  if (!bd->lock_user_stacking) e_border_raise(bd);
 		  if (!bd->lock_focus_out)
 		    {