diff --git a/src/appicon.c b/src/appicon.c index ee6aed61..6a6e4fd0 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -533,7 +533,7 @@ static void setIconCallback(WMenu *menu, WMenuEntry *entry) wMessageDialog(scr, _("Error"), _("Could not open specified icon file"), _("OK"), NULL, NULL); } else { - wDefaultChangeIcon(scr, icon->wm_instance, icon->wm_class, file); + wDefaultChangeIcon(icon->wm_instance, icon->wm_class, file); wAppIconPaint(icon); } if (file) diff --git a/src/defaults.h b/src/defaults.h index 767c534e..37120382 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -52,9 +52,9 @@ char *get_icon_filename(const char *winstance, const char *wclass, const char *c int wDefaultGetStartWorkspace(const char *instance, const char *class); -void wDefaultChangeIcon(WScreen *scr, const char *instance, const char* class, const char *file); +void wDefaultChangeIcon(const char *instance, const char* class, const char *file); RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int max_size); -void wDefaultPurgeInfo(WScreen *scr, const char *instance, const char *class); +void wDefaultPurgeInfo(const char *instance, const char *class); #endif /* WMDEFAULTS_H_ */ diff --git a/src/dock.c b/src/dock.c index ef45d3e6..c652e14f 100644 --- a/src/dock.c +++ b/src/dock.c @@ -4353,7 +4353,7 @@ static void drawerDestroy(WDock *drawer) /* Note regarding menus: we can't delete any dock/clip/drawer menu, because * that would (attempt to) wfree some memory in gettext library (see menu * entries that have several "versions", such like "Hide" and "Unhide"). */ - wDefaultPurgeInfo(scr, drawer->icon_array[0]->wm_instance, + wDefaultPurgeInfo(drawer->icon_array[0]->wm_instance, drawer->icon_array[0]->wm_class); if (drawer->icon_count == 2) { diff --git a/src/dockedapp.c b/src/dockedapp.c index a8ea024b..cc7292fa 100644 --- a/src/dockedapp.c +++ b/src/dockedapp.c @@ -184,7 +184,7 @@ static void panelBtnCallback(WMWidget * self, void *data) else wAppIconPaint(aicon); - wDefaultChangeIcon(panel->wwin->screen_ptr, aicon->wm_instance, aicon->wm_class, text); + wDefaultChangeIcon(aicon->wm_instance, aicon->wm_class, text); } if (text) wfree(text); diff --git a/src/wdefaults.c b/src/wdefaults.c index c663a1b5..24d2598b 100644 --- a/src/wdefaults.c +++ b/src/wdefaults.c @@ -529,7 +529,7 @@ char *wDefaultGetIconFile(const char *instance, const char *class, Bool default_ return tmp; } -void wDefaultChangeIcon(WScreen *scr, const char *instance, const char *class, const char *file) +void wDefaultChangeIcon(const char *instance, const char *class, const char *file) { WDDomain *db = w_global.domain.window_attr; WMPropList *icon_value = NULL, *value, *attr, *key, *def_win, *def_icon = NULL; @@ -593,7 +593,7 @@ void wDefaultChangeIcon(WScreen *scr, const char *instance, const char *class, c WMPLSetCaseSensitive(False); } -void wDefaultPurgeInfo(WScreen *scr, const char *instance, const char *class) +void wDefaultPurgeInfo(const char *instance, const char *class) { WMPropList *value, *key, *dict; char *buffer;