From: Rodolfo García Peñas (kix) <kix@kix.es>
Date: Wed, 31 Oct 2012 21:44:18 +0000 (+0100)
Subject: wIconChangeImageFile removed dup code
X-Git-Tag: wmaker-0.95.4~76
X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/3d0223ded4979c3d347baa0999573f8651766b0d

wIconChangeImageFile removed dup code

This patch removes the dup code with get_rimage_from_file.
---

diff --git a/src/icon.c b/src/icon.c
index 94d95670..0b95df25 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -369,10 +369,9 @@ RImage *wIconValidateIconSize(RImage *icon, int max_size)
 	return icon;
 }
 
-Bool wIconChangeImageFile(WIcon * icon, char *file)
+Bool wIconChangeImageFile(WIcon *icon, char *file)
 {
 	WScreen *scr = icon->core->screen_ptr;
-	RImage *image;
 	char *path;
 	int error = 0;
 
@@ -385,17 +384,20 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
 	}
 
 	path = FindImage(wPreferences.icon_path, file);
+	if (path) {
+		icon->file_image = get_rimage_from_file(scr, path, wPreferences.icon_size);
+		if (icon->file_image) {
+			icon->file = wstrdup(path);
+			wIconUpdate(icon);
+		} else {
+			error = 1;
+		}
 
-	if (path && (image = RLoadImage(scr->rcontext, path, 0))) {
-		icon->file_image = wIconValidateIconSize(image, wPreferences.icon_size);
-		wIconUpdate(icon);
+		wfree(path);
 	} else {
 		error = 1;
 	}
 
-	if (path)
-		wfree(path);
-
 	return !error;
 }