From 014bc52531ec5d554920ce82d3e1046e26f84a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?=
 <kix@kix.es>
Date: Tue, 8 Oct 2013 00:56:40 +0200
Subject: [PATCH] wClipIconPaint appicon argument removed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because the wClipIconPaint() function is specific to paint the clip,
it knows where is the clip (wks_info.clip_icon), so the argument is not
needed.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
---
 src/defaults.c  |  2 +-
 src/dock.c      | 13 +++++++------
 src/dock.h      |  2 +-
 src/dockedapp.c |  2 +-
 src/workspace.c |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/defaults.c b/src/defaults.c
index 0a29a9ec..b476c700 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -1228,7 +1228,7 @@ void wDefaultUpdateIcons(WScreen *scr)
 	}
 
 	if (!wPreferences.flags.noclip || wPreferences.flags.clip_merged_in_dock)
-		wClipIconPaint(w_global.clip.icon);
+		wClipIconPaint();
 
 	for (dc = scr->drawers; dc != NULL; dc = dc->next)
 		wDrawerIconPaint(dc->adrawer->icon_array[0]);
diff --git a/src/dock.c b/src/dock.c
index 9d691b22..8fdf9b89 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1363,8 +1363,9 @@ void wDockDestroy(WDock *dock)
 	wfree(dock);
 }
 
-void wClipIconPaint(WAppIcon *aicon)
+void wClipIconPaint(void)
 {
+	WAppIcon *aicon = w_global.clip.icon;
 	WScreen *scr = aicon->icon->core->screen_ptr;
 	WWorkspace *workspace = w_global.workspace.array[w_global.workspace.current];
 	WMColor *color;
@@ -1408,13 +1409,13 @@ void wClipIconPaint(WAppIcon *aicon)
 
 static void clipIconExpose(WObjDescriptor *desc, XEvent *event)
 {
-	wClipIconPaint(desc->parent);
+	wClipIconPaint();
 }
 
 static void dockIconPaint(WAppIcon *btn)
 {
 	if (btn == w_global.clip.icon) {
-		wClipIconPaint(btn);
+		wClipIconPaint();
 	} else if (wIsADrawer(btn)) {
 		wDrawerIconPaint(btn);
 	} else {
@@ -3861,7 +3862,7 @@ static void handleClipChangeWorkspace(WScreen *scr, XEvent *event)
 	clip->lclip_button_pushed = direction == CLIP_REWIND;
 	clip->rclip_button_pushed = direction == CLIP_FORWARD;
 
-	wClipIconPaint(w_global.clip.icon);
+	wClipIconPaint();
 	done = 0;
 	while (!done) {
 		WMMaskEvent(dpy, ExposureMask | ButtonMotionMask | ButtonReleaseMask | ButtonPressMask, &ev);
@@ -3876,7 +3877,7 @@ static void handleClipChangeWorkspace(WScreen *scr, XEvent *event)
 				direction = new_dir;
 				clip->lclip_button_pushed = direction == CLIP_REWIND;
 				clip->rclip_button_pushed = direction == CLIP_FORWARD;
-				wClipIconPaint(w_global.clip.icon);
+				wClipIconPaint();
 			}
 			break;
 
@@ -3908,7 +3909,7 @@ static void handleClipChangeWorkspace(WScreen *scr, XEvent *event)
 			wWorkspaceChange(scr, w_global.workspace.count - 1);
 	}
 
-	wClipIconPaint(w_global.clip.icon);
+	wClipIconPaint();
 }
 
 static void iconMouseDown(WObjDescriptor *desc, XEvent *event)
diff --git a/src/dock.h b/src/dock.h
index 5fd46372..9ac4d20c 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -96,7 +96,7 @@ void wDockLaunchWithState(WDock *dock, WAppIcon *btn, WSavedState *state);
 int wDockReceiveDNDDrop(WScreen *scr, XEvent *event);
 #endif
 
-void wClipIconPaint(WAppIcon *aicon);
+void wClipIconPaint(void);
 void wClipSaveState(WScreen *scr);
 WMPropList *wClipSaveWorkspaceState(WScreen *scr, int workspace);
 WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state);
diff --git a/src/dockedapp.c b/src/dockedapp.c
index adccd5b2..a8ea024b 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -178,7 +178,7 @@ static void panelBtnCallback(WMWidget * self, void *data)
 
 			// Cf dock.c:dockIconPaint(WAppIcon *aicon)?
 			if (aicon == w_global.clip.icon)
-				wClipIconPaint(aicon);
+				wClipIconPaint();
 			else if (wIsADrawer(aicon))
 				wDrawerIconPaint(aicon);
 			else
diff --git a/src/workspace.c b/src/workspace.c
index 3894852a..5ef6a3ef 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -624,7 +624,7 @@ void wWorkspaceForceChange(WScreen * scr, int workspace)
 		XMapWindow(dpy, w_global.clip.icon->icon->core->window);
 	}
 	else if (w_global.clip.icon != NULL) {
-		wClipIconPaint(w_global.clip.icon);
+		wClipIconPaint();
 	}
 	wScreenUpdateUsableArea(scr);
 	wNETWMUpdateDesktop(scr);
@@ -700,7 +700,7 @@ void wWorkspaceRename(WScreen *scr, int workspace, const char *name)
 	}
 
 	if (w_global.clip.icon)
-		wClipIconPaint(w_global.clip.icon);
+		wClipIconPaint();
 
 	WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void *)(uintptr_t) workspace);
 }