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

Changed get_default_icon_rimage function name

Browse Source 
The function get_default_icon_rimage name is not correct, because
the function doesn't return the default icon rimage, returns the
rimage from a file name. So the correct function name should be
get_rimage_from_file.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-10-24 00:00:00 +02:00
committed by Carlos R. Mafra
parent b8025ee899
commit 206fe5e821
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/defaults.h
View File

@@ -50,5 +50,5 @@ int wDefaultGetStartWorkspace(WScreen *scr, char *instance, char *class);
void wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file);
char *get_default_icon_filename(WScreen *scr, char *winstance, char *wclass, char *command,
Bool default_icon);
RImage *get_default_icon_rimage(WScreen *scr, char *file_name, int max_size);
RImage *get_rimage_from_file(WScreen *scr, char *file_name, int max_size);
#endif /* WMDEFAULTS_H_ */

4
src/icon.c
View File

@@ -142,7 +142,7 @@ WIcon *icon_create_for_wwindow(WWindow *wwin)
file = get_default_icon_filename(scr, wwin->wm_instance, wwin->wm_class, NULL, True);
if (file) {
icon->file = wstrdup(file);
icon->file_image = get_default_icon_rimage(scr, icon->file, wPreferences.icon_size);
icon->file_image = get_rimage_from_file(scr, icon->file, wPreferences.icon_size);
wfree(file);
}
@@ -167,7 +167,7 @@ WIcon *icon_create_for_dock(WScreen *scr, char *command, char *wm_instance, char
file = get_default_icon_filename(scr, wm_instance, wm_class, command, False);
if (file) {
icon->file = wstrdup(file);
icon->file_image = get_default_icon_rimage(scr, icon->file, wPreferences.icon_size);
icon->file_image = get_rimage_from_file(scr, icon->file, wPreferences.icon_size);
wfree(file);
}

4
src/wdefaults.c
View File

@@ -420,7 +420,7 @@ char *get_default_icon_filename(WScreen *scr, char *winstance, char *wclass, cha
}
/* This function returns the image picture for the file_name file */
RImage *get_default_icon_rimage(WScreen *scr, char *file_name, int max_size)
RImage *get_rimage_from_file(WScreen *scr, char *file_name, int max_size)
{
RImage *image = NULL;
@@ -446,7 +446,7 @@ RImage *wDefaultGetImage(WScreen * scr, char *winstance, char *wclass, int max_s
if (!file_name)
return NULL;
return get_default_icon_rimage(scr, file_name, max_size);
return get_rimage_from_file(scr, file_name, max_size);
}
int wDefaultGetStartWorkspace(WScreen * scr, char *instance, char *class)