From 01ea1fa8b428d335a39bcafe01548034449a0501 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: Thu, 31 May 2012 16:39:43 +0200
Subject: [PATCH] New function app_icon_create_from_docks

The new function app_icon_create_from_docks do all the needed stuff to create
the application app_icon using a previous image in docks.

The contents of the app_icon_create_from_docks were moved from the
wApplicationCreate function. Now this function is more clear.
---
 src/application.c | 76 +++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/application.c b/src/application.c
index 31165143..c8e4f4b1 100644
--- a/src/application.c
+++ b/src/application.c
@@ -206,6 +206,46 @@ void wApplicationExtractDirPackIcon(WScreen * scr, char *path, char *wm_instance
 	}
 }
 
+static void app_icon_create_from_docks(WWindow *wwin, WApplication *wapp, Window main_window)
+{
+	WScreen *scr = wwin->screen_ptr;
+
+	if (scr->last_dock)
+		wapp->app_icon = findDockIconFor(scr->last_dock, main_window);
+
+	/* check main dock if we did not find it in last dock */
+	if (!wapp->app_icon && scr->dock)
+		wapp->app_icon = findDockIconFor(scr->dock, main_window);
+
+	/* finally check clips */
+	if (!wapp->app_icon) {
+		int i;
+		for (i = 0; i < scr->workspace_count; i++) {
+			WDock *dock = scr->workspaces[i]->clip;
+			if (dock)
+				wapp->app_icon = findDockIconFor(dock, main_window);
+			if (wapp->app_icon)
+				break;
+		}
+	}
+
+	/* If created, then set some flags */
+	if (wapp->app_icon) {
+		WWindow *mainw = wapp->main_window_desc;
+
+		wapp->app_icon->running = 1;
+		wapp->app_icon->icon->force_paint = 1;
+		wapp->app_icon->icon->owner = mainw;
+		if (mainw->wm_hints && (mainw->wm_hints->flags & IconWindowHint))
+			wapp->app_icon->icon->icon_win = mainw->wm_hints->icon_window;
+
+		wAppIconPaint(wapp->app_icon);
+		wAppIconSave(wapp->app_icon);
+	} else {
+		wapp->app_icon = wAppIconCreate(wapp->main_window_desc);
+	}
+}
+
 WApplication *wApplicationCreate(WWindow * wwin)
 {
 	WScreen *scr = wwin->screen_ptr;
@@ -277,40 +317,10 @@ WApplication *wApplicationCreate(WWindow * wwin)
 	XSaveContext(dpy, main_window, wAppWinContext, (XPointer) wapp);
 
 	wapp->app_icon = NULL;
-	if (!WFLAGP(wapp->main_window_desc, no_appicon)) {
-		if (scr->last_dock)
-			wapp->app_icon = findDockIconFor(scr->last_dock, main_window);
 
-		/* check main dock if we did not find it in last dock */
-		if (!wapp->app_icon && scr->dock)
-			wapp->app_icon = findDockIconFor(scr->dock, main_window);
-
-		/* finally check clips */
-		if (!wapp->app_icon) {
-			int i;
-			for (i = 0; i < scr->workspace_count; i++) {
-				WDock *dock = scr->workspaces[i]->clip;
-				if (dock)
-					wapp->app_icon = findDockIconFor(dock, main_window);
-				if (wapp->app_icon)
-					break;
-			}
-		}
-
-		if (wapp->app_icon) {
-			WWindow *mainw = wapp->main_window_desc;
-
-			wapp->app_icon->running = 1;
-			wapp->app_icon->icon->force_paint = 1;
-			wapp->app_icon->icon->owner = mainw;
-			if (mainw->wm_hints && (mainw->wm_hints->flags & IconWindowHint))
-				wapp->app_icon->icon->icon_win = mainw->wm_hints->icon_window;
-			wAppIconPaint(wapp->app_icon);
-			wAppIconSave(wapp->app_icon);
-		} else {
-			wapp->app_icon = wAppIconCreate(wapp->main_window_desc);
-		}
-	}
+	/* Create the application icon using the icon from docks */
+	if (!WFLAGP(wapp->main_window_desc, no_appicon))
+		app_icon_create_from_docks(wwin, wapp, main_window);
 
 	if (wapp->app_icon)
 		wapp->app_icon->main_window = main_window;