gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-23 22:52:34 +01:00
Code Issues Projects Releases Wiki Activity

wIconChangeImageFile removed dup code

Browse Source 
This patch removes the dup code with get_rimage_from_file.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-10-31 22:44:18 +01:00
committed by Carlos R. Mafra
parent 156d8ebfa5
commit 3d0223ded4
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/icon.c
View File

@@ -369,10 +369,9 @@ RImage *wIconValidateIconSize(RImage *icon, int max_size)
return icon; return icon;
} }
Bool wIconChangeImageFile(WIcon * icon, char *file) Bool wIconChangeImageFile(WIcon *icon, char *file)
{ {
WScreen *scr = icon->core->screen_ptr; WScreen *scr = icon->core->screen_ptr;
RImage *image;
char *path; char *path;
int error = 0; int error = 0;
@@ -385,17 +384,20 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
} }
path = FindImage(wPreferences.icon_path, 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))) { wfree(path);
icon->file_image = wIconValidateIconSize(image, wPreferences.icon_size);
wIconUpdate(icon);
} else { } else {
error = 1; error = 1;
} }
if (path)
wfree(path);
return !error; return !error;
} }