From f5d845cfadeedce4a848189de01a6c4c95cd7db7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= <kix@kix.es>
Date: Tue, 3 Jul 2012 11:47:15 +0200
Subject: [PATCH] Remove unused argument from wDefaultFillAttributes()

The function wDefaultFillAttributes() doesn't use the argument WScreen,
so it can be removed.
---
 src/application.c | 4 ++--
 src/defaults.h    | 2 +-
 src/dock.c        | 5 ++---
 src/wdefaults.c   | 6 +++---
 src/window.c      | 6 +++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/application.c b/src/application.c
index 4e34f359..7c52fa0d 100644
--- a/src/application.c
+++ b/src/application.c
@@ -59,8 +59,8 @@ static WWindow *makeMainWindow(WScreen * scr, Window window)
 
 	PropGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
 
-	wDefaultFillAttributes(scr, wwin->wm_instance, wwin->wm_class,
-			       &wwin->user_flags, &wwin->defined_user_flags, True);
+	wDefaultFillAttributes(wwin->wm_instance, wwin->wm_class, &wwin->user_flags,
+			       &wwin->defined_user_flags, True);
 
 	XSelectInput(dpy, window, attr.your_event_mask | PropertyChangeMask | StructureNotifyMask);
 	return wwin;
diff --git a/src/defaults.h b/src/defaults.h
index 199abb79..9b5ea957 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -37,7 +37,7 @@ void wDefaultUpdateIcons(WScreen *scr);
 void wReadStaticDefaults(WMPropList *dict);
 void wDefaultsCheckDomains(void *arg);
 void wSaveDefaults(WScreen *scr);
-void wDefaultFillAttributes(WScreen *scr, char *instance, char *class,
+void wDefaultFillAttributes(char *instance, char *class,
                             WWindowAttributes *attr, WWindowAttributes *mask,
                             Bool useGlobalDefault);
 
diff --git a/src/dock.c b/src/dock.c
index 05824d47..0db0fe57 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -804,7 +804,7 @@ static void launchDockedApplication(WAppIcon *btn, Bool withSelection)
 		if (btn->wm_instance || btn->wm_class) {
 			WWindowAttributes attr;
 			memset(&attr, 0, sizeof(WWindowAttributes));
-			wDefaultFillAttributes(scr, btn->wm_instance, btn->wm_class, &attr, NULL, True);
+			wDefaultFillAttributes(btn->wm_instance, btn->wm_class, &attr, NULL, True);
 
 			if (!attr.no_appicon && !btn->buggy_app)
 				btn->launching = 1;
@@ -1840,8 +1840,7 @@ int wDockReceiveDNDDrop(WScreen *scr, XEvent *event)
 		if (btn->wm_instance || btn->wm_class) {
 			WWindowAttributes attr;
 			memset(&attr, 0, sizeof(WWindowAttributes));
-			wDefaultFillAttributes(btn->icon->core->screen_ptr,
-					       btn->wm_instance, btn->wm_class, &attr, NULL, True);
+			wDefaultFillAttributes(btn->wm_instance, btn->wm_class, &attr, NULL, True);
 
 			if (!attr.no_appicon)
 				btn->launching = 1;
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 2169a2fe..a34d86ec 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -199,9 +199,9 @@ static WMPropList *get_value_from_instanceclass(char *value)
  *
  *----------------------------------------------------------------------
  */
-void
-wDefaultFillAttributes(WScreen * scr, char *instance, char *class,
-		       WWindowAttributes * attr, WWindowAttributes * mask, Bool useGlobalDefault)
+void wDefaultFillAttributes(char *instance, char *class,
+			    WWindowAttributes *attr, WWindowAttributes *mask,
+			    Bool useGlobalDefault)
 {
 	WMPropList *value, *dw, *dc, *dn, *da;
 	char *buffer;
diff --git a/src/window.c b/src/window.c
index 4de0aaca..50962f70 100644
--- a/src/window.c
+++ b/src/window.c
@@ -302,7 +302,7 @@ void wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
 	WScreen *scr = wwin->screen_ptr;
 
 	/* sets global default stuff */
-	wDefaultFillAttributes(scr, wwin->wm_instance, wwin->wm_class, &wwin->client_flags, NULL, True);
+	wDefaultFillAttributes(wwin->wm_instance, wwin->wm_class, &wwin->client_flags, NULL, True);
 	/*
 	 * Decoration setting is done in this precedence (lower to higher)
 	 * - use global default in the resource database
@@ -393,8 +393,8 @@ void wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
 	 * Set attributes specified only for that window/class.
 	 * This might do duplicate work with the 1st wDefaultFillAttributes().
 	 */
-	wDefaultFillAttributes(scr, wwin->wm_instance, wwin->wm_class,
-			       &wwin->user_flags, &wwin->defined_user_flags, False);
+	wDefaultFillAttributes(wwin->wm_instance, wwin->wm_class, &wwin->user_flags,
+			       &wwin->defined_user_flags, False);
 	/*
 	 * Sanity checks for attributes that depend on other attributes
 	 */
-- 
2.11.4.GIT