From a95694c177eba43ae5bdc9bac686c5bb34d522db Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 27 Dec 2007 14:02:27 +0100
Subject: [PATCH] simplify proto

---
 screen.c |  2 +-
 tag.c    | 11 +++++------
 tag.h    |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/screen.c b/screen.c
index 7fc77ae54..3fd903ac5 100644
--- a/screen.c
+++ b/screen.c
@@ -189,7 +189,7 @@ move_client_to_screen(Client *c, int new_screen, Bool doresize)
         untag_client(c, tag, old_screen);
 
     /* tag client with new screen tags */
-    tag_client_with_current_selected(c, new_screen);
+    tag_client_with_current_selected(c);
 
     c->screen = new_screen;
 
diff --git a/tag.c b/tag.c
index 22b43f1a8..faa337a11 100644
--- a/tag.c
+++ b/tag.c
@@ -94,17 +94,16 @@ is_client_tagged(Client *c, Tag *t, int screen)
 }
 
 void
-tag_client_with_current_selected(Client *c, int screen)
+tag_client_with_current_selected(Client *c)
 {
     Tag *tag;
-    VirtScreen vscreen;
+    VirtScreen vscreen = globalconf.screens[c->screen];
 
-    vscreen = globalconf.screens[screen];
     for(tag = vscreen.tags; tag; tag = tag->next)
         if(tag->selected)
-            tag_client(c, tag, screen);
+            tag_client(c, tag, c->screen);
         else
-            untag_client(c, tag, screen);
+            untag_client(c, tag, c->screen);
 }
 
 void
@@ -132,7 +131,7 @@ tag_client_with_rules(Client *c)
                     untag_client(c, tag, c->screen);
 
             if(!matched)
-                tag_client_with_current_selected(c, c->screen);
+                tag_client_with_current_selected(c);
             break;
         }
 }
diff --git a/tag.h b/tag.h
index cf6c35342..45c0d1f17 100644
--- a/tag.h
+++ b/tag.h
@@ -31,7 +31,7 @@ Tag ** get_current_tags(int );
 void tag_client(Client *, Tag *, int);
 void untag_client(Client *, Tag *, int);
 Bool is_client_tagged(Client *, Tag *, int);
-void tag_client_with_current_selected(Client *, int);
+void tag_client_with_current_selected(Client *);
 void tag_client_with_rules(Client *);
 
 UICB_PROTO(uicb_client_tag);