From 1fb452ea953e0a34142031b04f909dfb8cc1de8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Tue, 17 Jul 2012 23:28:45 +0200 Subject: [PATCH] Remove dup code in wAppIconCreateForDock Some code in wAppIconCreateForDock() is duplicated with the function get_default_icon_filename(). It can be removed. --- src/appicon.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/appicon.c b/src/appicon.c index e3672ff3..a899d7c5 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -128,15 +128,7 @@ WAppIcon *wAppIconCreateForDock(WScreen * scr, char *command, char *wm_instance, dicon->wm_instance = wstrdup(wm_instance); /* Search the icon using instance and class, without default icon */ - path = wDefaultGetIconFile(wm_instance, wm_class, False); - if (!path && command) { - wApplicationExtractDirPackIcon(scr, command, wm_instance, wm_class); - /* Search again, now with default icon */ - path = wDefaultGetIconFile(wm_instance, wm_class, True); - } - - if (path) - path = FindImage(wPreferences.icon_path, path); + path = get_default_icon_filename(scr, wm_instance, wm_class, command, False); dicon->icon = wIconCreateWithIconFile(scr, path, tile); if (path) -- 2.11.4.GIT