mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 04:48:06 +01:00
wApplicationExtractDirPackIcon doesn't use WScreen
The function wApplicationExtractDirPackIcon now doesn't need the argument WScreen, so can be removed.
This commit is contained in:
committed by
Carlos R. Mafra
parent
4e4d75c55e
commit
453a0226ad
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user