gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Removed WScreen argument in wIconValidateIconSize

Browse Source 
This patch removes the argument WScreen in wIconValidateIconSize,
because is not used.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-07-15 21:25:05 +02:00
committed by Carlos R. Mafra
parent 35a2ed24ec
commit 2e7b7b7e02
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/icon.c
View File

@@ -160,8 +160,7 @@ WIcon *wIconCreateWithIconFile(WScreen * scr, char *iconfile, int tile)
if (!icon->file_image) if (!icon->file_image)
wwarning(_("error loading image file \"%s\": %s"), iconfile, RMessageForError(RErrorCode)); wwarning(_("error loading image file \"%s\": %s"), iconfile, RMessageForError(RErrorCode));
icon->file_image = wIconValidateIconSize(scr, icon->file_image, wPreferences.icon_size); icon->file_image = wIconValidateIconSize(icon->file_image, wPreferences.icon_size);
icon->file = wstrdup(iconfile); icon->file = wstrdup(iconfile);
} }
@@ -338,7 +337,7 @@ void wIconChangeTitle(WIcon * icon, char *new_title)
wIconPaint(icon); wIconPaint(icon);
} }
RImage *wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size) RImage *wIconValidateIconSize(RImage *icon, int max_size)
{ {
RImage *nimage; RImage *nimage;
@@ -376,7 +375,7 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
path = FindImage(wPreferences.icon_path, file); path = FindImage(wPreferences.icon_path, file);
if (path && (image = RLoadImage(scr->rcontext, path, 0))) { if (path && (image = RLoadImage(scr->rcontext, path, 0))) {
icon->file_image = wIconValidateIconSize(icon->core->screen_ptr, image, wPreferences.icon_size); icon->file_image = wIconValidateIconSize(image, wPreferences.icon_size);
wIconUpdate(icon); wIconUpdate(icon);
} else { } else {
error = 1; error = 1;
@@ -630,7 +629,7 @@ void get_pixmap_icon_from_user_icon(WScreen *scr, WIcon * icon)
} }
} }
image = wIconValidateIconSize(scr, image, wPreferences.icon_size); image = wIconValidateIconSize(image, wPreferences.icon_size);
scr->def_icon_pixmap = makeIcon(scr, image, False, False, icon->tile_type, icon->highlighted); scr->def_icon_pixmap = makeIcon(scr, image, False, False, icon->tile_type, icon->highlighted);
scr->def_ticon_pixmap = makeIcon(scr, image, True, False, icon->tile_type, icon->highlighted); scr->def_ticon_pixmap = makeIcon(scr, image, True, False, icon->tile_type, icon->highlighted);
if (image) if (image)

2
src/icon.h
View File

@@ -65,7 +65,7 @@ void wIconChangeTitle(WIcon *icon, char *new_title);
Bool wIconChangeImageFile(WIcon *icon, char *file); Bool wIconChangeImageFile(WIcon *icon, char *file);
RImage * wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size); RImage *wIconValidateIconSize(RImage *icon, int max_size);
char *wIconStore(WIcon *icon); char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class); char *get_name_for_instance_class(char *wm_instance, char *wm_class);

2
src/wdefaults.c
View File

@@ -432,7 +432,7 @@ RImage *get_default_icon_rimage(WScreen *scr, char *file_name, int max_size)
wwarning(_("error loading image file \"%s\": %s"), file_name, wwarning(_("error loading image file \"%s\": %s"), file_name,
RMessageForError(RErrorCode)); RMessageForError(RErrorCode));
image = wIconValidateIconSize(scr, image, max_size); image = wIconValidateIconSize(image, max_size);
return image; return image;
} }