From bd3fb214416a88a672c2674aa47ef202d9c5ceb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Fri, 1 Jun 2012 12:54:55 +0200 Subject: [PATCH] Remove code duplication by calling paint_app_icon() The code in application.c to create+paint the application icon is included in appicon.c (function paint_app_icon). --- src/application.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/src/application.c b/src/application.c index c8e4f4b1..6508e091 100644 --- a/src/application.c +++ b/src/application.c @@ -322,34 +322,8 @@ WApplication *wApplicationCreate(WWindow * wwin) if (!WFLAGP(wapp->main_window_desc, no_appicon)) app_icon_create_from_docks(wwin, wapp, main_window); - if (wapp->app_icon) - wapp->app_icon->main_window = main_window; - - if (wapp->app_icon && !wapp->app_icon->docked) { - WIcon *icon = wapp->app_icon->icon; - WDock *clip = scr->workspaces[scr->current_workspace]->clip; - int x = 0, y = 0; - - if (clip && clip->attract_icons && wDockFindFreeSlot(clip, &x, &y)) { - wapp->app_icon->attracted = 1; - if (!icon->shadowed) { - icon->shadowed = 1; - icon->force_paint = 1; - /* wAppIconPaint() is done in wDockAttachIcon() below */ - } - wDockAttachIcon(clip, wapp->app_icon, x, y); - } else { - PlaceIcon(scr, &x, &y, wGetHeadForWindow(wapp->main_window_desc)); - wAppIconMove(wapp->app_icon, x, y); - wLowerFrame(icon->core); - } - - if (!clip || !wapp->app_icon->attracted || !clip->collapsed) - XMapWindow(dpy, icon->core->window); - } - - if (wPreferences.auto_arrange_icons && wapp->app_icon && !wapp->app_icon->attracted) - wArrangeIcons(scr, True); + /* Now, paint the icon */ + paint_app_icon(wapp); /* Save the app_icon in a file */ save_app_icon(wwin, wapp);