This patch removes the function icon_create_for_dock() because the function has only two lines. These lines are moved to the function wAppIconCreateForDock() and the function is removed.
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- src/appicon.c | 4 +++- src/icon.c | 10 ---------- src/icon.h | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/appicon.c b/src/appicon.c index 8cfcf0f..e8afac1 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -128,7 +128,9 @@ WAppIcon *wAppIconCreateForDock(WScreen *scr, const char *command, const char *w if (strcmp(wm_class, "WMDock") == 0 && wPreferences.flags.clip_merged_in_dock) tile = TILE_CLIP; - aicon->icon = icon_create_for_dock(scr, command, wm_instance, wm_class, tile); + + aicon->icon = icon_create(command, wm_instance, wm_class, tile); + icon_draw(scr, aicon->icon, 0, 0, NULL); #ifdef XDND wXDNDMakeAwareness(aicon->icon->core->window); diff --git a/src/icon.c b/src/icon.c index 9a2b38a..eb9aad3 100644 --- a/src/icon.c +++ b/src/icon.c @@ -172,16 +172,6 @@ WIcon *icon_create_for_wwindow(WWindow *wwin) return icon; } -WIcon *icon_create_for_dock(WScreen *scr, const char *command, const char *wm_instance, const char *wm_class, int tile) -{ - WIcon *icon; - - icon = icon_create(command, wm_instance, wm_class, tile); - icon_draw(scr, icon, 0, 0, NULL); - - return icon; -} - static WIcon *icon_create_core(void) { WIcon *icon; diff --git a/src/icon.h b/src/icon.h index 1a14b9d..c1f0226 100644 --- a/src/icon.h +++ b/src/icon.h @@ -54,7 +54,6 @@ typedef struct WIcon { } WIcon; WIcon *icon_create(const char *command, const char *wm_instance, const char *wm_class, int tile); -WIcon *icon_create_for_dock(WScreen *scr, const char *command, const char *wm_instance, const char *wm_class, int tile); WIcon *icon_create_for_wwindow(WWindow *wwin); void icon_draw(WScreen *scr, WIcon *icon, int x, int y, WWindow *wwin); -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
