From b41873dced6f179736e7b8fdec5bb070eed87508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 25 Jun 2015 16:58:08 +0200
Subject: [PATCH] window-x11: Remove duplicated code

meta_window_change_workspace_without_transients() already does
exactly that.
---
 src/x11/window-x11.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index c883c6f46..b6e56216b 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -2247,19 +2247,11 @@ meta_window_x11_client_message (MetaWindow *window,
                                             space);
 
       if (workspace)
-        {
-          if (window->on_all_workspaces_requested)
-            meta_window_unstick (window);
-          meta_window_change_workspace (window, workspace);
-        }
+        meta_window_change_workspace (window, workspace);
       else if (space == (int) 0xFFFFFFFF)
-        {
-          meta_window_stick (window);
-        }
+        meta_window_stick (window);
       else
-        {
-          meta_verbose ("No such workspace %d for screen\n", space);
-        }
+        meta_verbose ("No such workspace %d for screen\n", space);
 
       meta_verbose ("Window %s now on_all_workspaces = %d\n",
                     window->desc, window->on_all_workspaces);