From d8909a947c596f658d7c36614b659775b748409c Mon Sep 17 00:00:00 2001
From: Uli Schlachter <psychon@znc.in>
Date: Mon, 24 Mar 2014 09:49:44 +0100
Subject: [PATCH] Revert "Set c.screen in ewmh.tag and before tags in
 rules.execute"

This reverts commit 6280998306f31064db50a21eac98d193901c546e.
---
 lib/awful/ewmh.lua.in  | 1 -
 lib/awful/rules.lua.in | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/awful/ewmh.lua.in b/lib/awful/ewmh.lua.in
index e2fc0b4e3..e69282969 100644
--- a/lib/awful/ewmh.lua.in
+++ b/lib/awful/ewmh.lua.in
@@ -147,7 +147,6 @@ function ewmh.tag(c, t)
     if not t then
         c.sticky = true
     else
-        c.screen = awful.tag.getscreen(t)
         c:tags({ t })
     end
 end
diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua.in
index 32d84a4d1..cb657cada 100644
--- a/lib/awful/rules.lua.in
+++ b/lib/awful/rules.lua.in
@@ -206,8 +206,8 @@ function rules.execute(c, props, callbacks)
         if property == "floating" then
             aclient.floating.set(c, value)
         elseif property == "tag" then
-            c.screen = atag.getscreen(value)
             c:tags({ value })
+            c.screen = atag.getscreen(value)
         elseif property == "switchtotag" and value and props.tag then
             atag.viewonly(props.tag)
         elseif property == "height" or property == "width" or