1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00

get_default_icon_filename rewritten

The function get_default_icon_filename(), now get_icon_filename(),
was working in a bad way. Before this patch, the function always
searched the default icon in the second search:

-     file_name = wDefaultGetIconFile(winstance, wclass, True);
+     file_name = wDefaultGetIconFile(winstance, wclass, False);

For this reason, the argument default_icon didn't work.

This patch change it. Now, if the default_icon is false, the function
can return NULL, then other functions can do the correct work. For
example, now wDefaultGetImage() doesn't need do nothing, because the
default_icon is set to True. get_icon_filename() checks if the
icon exists in the disk before returning it (except for default icon
in get_default_image_path(scr).
This commit is contained in:
Rodolfo García Peñas (kix)
2012-11-10 19:25:54 +01:00
committed by Carlos R. Mafra
parent 6bc48464e9
commit c3a1c76b44
4 changed files with 14 additions and 29 deletions

View File

@@ -1467,7 +1467,7 @@ static WMPixmap *getWindowMakerIconImage(WMScreen *scr)
char *path = NULL;
/* Get the Logo icon, without the default icon */
path = get_default_icon_filename(NULL, "Logo", "WMPanel", NULL, False);
path = get_icon_filename(NULL, "Logo", "WMPanel", NULL, False);
if (path) {
RColor gray;