From 206fe5e821cf7cd6d165378c93b1375a28f19044 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Wed, 24 Oct 2012 00:00:00 +0200 Subject: [PATCH] Changed get_default_icon_rimage function name 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. --- src/defaults.h | 2 +- src/icon.c | 4 ++-- src/wdefaults.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/defaults.h b/src/defaults.h index 87ea8fb5..2541f208 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -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_ */ diff --git a/src/icon.c b/src/icon.c index 95ab5686..b4ccfc5b 100644 --- a/src/icon.c +++ b/src/icon.c @@ -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); } diff --git a/src/wdefaults.c b/src/wdefaults.c index c4cd8197..8a4cdaba 100644 --- a/src/wdefaults.c +++ b/src/wdefaults.c @@ -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) -- 2.11.4.GIT