From: "Rodolfo García Peñas (kix)" <[email protected]>
This patch removes the dup code with get_rimage_from_file.
---
src/icon.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index 94d9567..0b95df2 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;
}
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
