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

wDefaultGetImage renamed to get_icon_image

Browse Source 
The function wDefaultGetImage is renamed to get_icon_image.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-11-10 19:25:55 +01:00
committed by Carlos R. Mafra
parent c3a1c76b44
commit 658597b889
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/defaults.h
View File

@@ -42,15 +42,16 @@ void wDefaultFillAttributes(char *instance, char *class,
Bool useGlobalDefault); Bool useGlobalDefault);
char *get_default_image_path(WScreen *scr); char *get_default_image_path(WScreen *scr);
RImage *get_default_image(WScreen *scr);
char *wDefaultGetIconFile(char *instance, char *class, Bool default_icon); char *wDefaultGetIconFile(char *instance, char *class, Bool default_icon);
RImage * wDefaultGetImage(WScreen *scr, char *winstance, char *wclass, int max_size); RImage *get_icon_image(WScreen *scr, char *winstance, char *wclass, int max_size);
char *get_icon_filename(WScreen *scr, char *winstance, char *wclass, char *command,
Bool default_icon);
int wDefaultGetStartWorkspace(WScreen *scr, char *instance, char *class); int wDefaultGetStartWorkspace(WScreen *scr, char *instance, char *class);
void wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file); void wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file);
RImage *get_default_image(WScreen *scr);
char *get_icon_filename(WScreen *scr, char *winstance, char *wclass, char *command,
Bool default_icon);
RImage *get_rimage_from_file(WScreen *scr, char *file_name, int max_size); RImage *get_rimage_from_file(WScreen *scr, char *file_name, int max_size);
#endif /* WMDEFAULTS_H_ */ #endif /* WMDEFAULTS_H_ */

2
src/screen.c
View File

@@ -413,7 +413,7 @@ static void createPixmaps(WScreen * scr)
void create_logo_image(WScreen *scr) void create_logo_image(WScreen *scr)
{ {
RImage *image = wDefaultGetImage(scr, "Logo", "WMPanel", wPreferences.icon_size); RImage *image = get_icon_image(scr, "Logo", "WMPanel", wPreferences.icon_size);
if (!image) { if (!image) {
wwarning(_("could not load logo image for panels: %s"), RMessageForError(RErrorCode)); wwarning(_("could not load logo image for panels: %s"), RMessageForError(RErrorCode));

4
src/switchpanel.c
View File

@@ -161,9 +161,9 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow *wwi
if (!WFLAGP(wwin, always_user_icon) && wwin->net_icon_image) if (!WFLAGP(wwin, always_user_icon) && wwin->net_icon_image)
image = RRetainImage(wwin->net_icon_image); image = RRetainImage(wwin->net_icon_image);
/* wDefaultGetImage() includes the default icon image */ /* get_icon_image() includes the default icon image */
if (!image) if (!image)
image = wDefaultGetImage(panel->scr, wwin->wm_instance, wwin->wm_class, ICON_TILE_SIZE); image = get_icon_image(panel->scr, wwin->wm_instance, wwin->wm_class, ICON_TILE_SIZE);
/* We must resize the icon size (~64) to the switchpanel icon size (~48) */ /* We must resize the icon size (~64) to the switchpanel icon size (~48) */
image = wIconValidateIconSize(image, ICON_SIZE); image = wIconValidateIconSize(image, ICON_SIZE);

2
src/wdefaults.c
View File

@@ -469,7 +469,7 @@ RImage *get_default_image(WScreen *scr)
return image; return image;
} }
RImage *wDefaultGetImage(WScreen *scr, char *winstance, char *wclass, int max_size) RImage *get_icon_image(WScreen *scr, char *winstance, char *wclass, int max_size)
{ {
char *file_name = NULL; char *file_name = NULL;