[PATCH 2/4] 2 winspector: No use text input if NULL

[Rodolfo García Peñas]

>From 6bdcf07925f1ffed3538e2215f61fee54fc8f010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Wed, 28 Nov 2012 22:50:51 +0100
Subject: [PATCH 2/4] 2 winspector: No use text input if NULL

This patch don't use the text input for the file if is empty.
The function should use the function to get the icon provided
by the client.

---
 src/winspector.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/winspector.c b/src/winspector.c
index 7e916e7..543b764 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -736,7 +736,9 @@ static void applySettings(WMButton *button, InspectorPanel 
*panel)
                        file = NULL;
                }
 
-               if (WFLAGP(wwin, always_user_icon)) {
+               /* If file is NULL, the always_user_icon don't matter,
+                * because we need read the icon from the window */
+               if (file && WFLAGP(wwin, always_user_icon)) {
                        /* Change icon image if the app is minimized */
                        if (wwin->icon)
                                wIconChangeImageFile(wwin->icon, file);
-- 
1.7.10.4


>From 6bdcf07925f1ffed3538e2215f61fee54fc8f010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Wed, 28 Nov 2012 22:50:51 +0100
Subject: [PATCH 2/4] 2 winspector: No use text input if NULL

This patch don't use the text input for the file if is empty.
The function should use the function to get the icon provided
by the client.

---
 src/winspector.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/winspector.c b/src/winspector.c
index 7e916e7..543b764 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -736,7 +736,9 @@ static void applySettings(WMButton *button, InspectorPanel *panel)
 			file = NULL;
 		}
 
-		if (WFLAGP(wwin, always_user_icon)) {
+		/* If file is NULL, the always_user_icon don't matter,
+		 * because we need read the icon from the window */
+		if (file && WFLAGP(wwin, always_user_icon)) {
 			/* Change icon image if the app is minimized */
 			if (wwin->icon)
 				wIconChangeImageFile(wwin->icon, file);
-- 
1.7.10.4