From 453a0226adfd81ade6885c9af1e4875c9575ab18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Thu, 5 Sep 2013 21:08:17 +0200 Subject: [PATCH] wApplicationExtractDirPackIcon doesn't use WScreen The function wApplicationExtractDirPackIcon now doesn't need the argument WScreen, so can be removed. --- src/appicon.c | 2 +- src/appicon.h | 2 +- src/wdefaults.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/appicon.c b/src/appicon.c index 7b7323f6..8e22c36e 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -79,7 +79,7 @@ static void create_appicon_from_dock(WWindow *wwin, WApplication *wapp, Window m /* This function is used if the application is a .app. It checks if it has an icon in it * like for example /usr/local/GNUstep/Applications/WPrefs.app/WPrefs.tiff */ -void wApplicationExtractDirPackIcon(WScreen * scr, const char *path, const char *wm_instance, const char *wm_class) +void wApplicationExtractDirPackIcon(const char *path, const char *wm_instance, const char *wm_class) { char *iconPath = NULL; char *tmp = NULL; diff --git a/src/appicon.h b/src/appicon.h index f6e1ae61..2456ba26 100644 --- a/src/appicon.h +++ b/src/appicon.h @@ -81,7 +81,7 @@ void removeAppIconFor(WApplication * wapp); void save_appicon(WAppIcon *aicon, Bool dock); void paint_app_icon(WApplication *wapp); void unpaint_app_icon(WApplication *wapp); -void wApplicationExtractDirPackIcon(WScreen *scr, const char *path, const char *wm_instance, +void wApplicationExtractDirPackIcon(const char *path, const char *wm_instance, const char *wm_class); WAppIcon *wAppIconFor(Window window); diff --git a/src/wdefaults.c b/src/wdefaults.c index 09cf2c52..9d33584f 100644 --- a/src/wdefaults.c +++ b/src/wdefaults.c @@ -391,7 +391,7 @@ char *get_icon_filename(WScreen *scr, const char *winstance, const char *wclass, /* If the specific icon filename is not found, and command is specified, * then include the .app icons and re-do the search. */ if ((!file_name || !file_path ) && scr && command) { - wApplicationExtractDirPackIcon(scr, command, winstance, wclass); + wApplicationExtractDirPackIcon(command, winstance, wclass); file_name = wDefaultGetIconFile(winstance, wclass, False); }