From: "Rodolfo García Peñas (kix)" <k...@kix.es> The variable aicon is used to have shorter lines.
This patch also removes an extra curly bracket. --- src/appicon.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/src/appicon.c b/src/appicon.c index caa6292..a6b8609 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -255,41 +255,46 @@ void paint_app_icon(WApplication *wapp) void removeAppIconFor(WApplication *wapp) { + WAppIcon *aicon; + if (!wapp->app_icon) return; + /* Short lines */ + aicon = wapp->app_icon; + if (wPreferences.highlight_active_app) - wIconSetHighlited(wapp->app_icon->icon, False); - if (wapp->app_icon->docked && !wapp->app_icon->attracted) { - wapp->app_icon->running = 0; + wIconSetHighlited(aicon->icon, False); + if (aicon->docked && !aicon->attracted) { + aicon->running = 0; /* since we keep it, we don't care if it was attracted or not */ - wapp->app_icon->attracted = 0; - wapp->app_icon->icon->shadowed = 0; - wapp->app_icon->main_window = None; - wapp->app_icon->pid = 0; - wapp->app_icon->icon->owner = NULL; - wapp->app_icon->icon->icon_win = None; + aicon->attracted = 0; + aicon->icon->shadowed = 0; + aicon->main_window = None; + aicon->pid = 0; + aicon->icon->owner = NULL; + aicon->icon->icon_win = None; /* Set the icon image */ - set_icon_image_from_database(wapp->app_icon->icon, wapp->app_icon->wm_instance, - wapp->app_icon->wm_class, wapp->app_icon->command); + set_icon_image_from_database(aicon->icon, aicon->wm_instance, + aicon->wm_class, aicon->command); - /* Update the icon, because wapp->app_icon->icon could be NULL */ - wIconUpdate(wapp->app_icon->icon); + /* Update the icon, because aicon->icon could be NULL */ + wIconUpdate(aicon->icon); /* Paint it */ - wAppIconPaint(wapp->app_icon); - } else if (wapp->app_icon->docked) { - wapp->app_icon->running = 0; - if (wapp->app_icon->dock->type == WM_DRAWER) { - wDrawerFillTheGap(wapp->app_icon->dock, wapp->app_icon, True); - } - wDockDetach(wapp->app_icon->dock, wapp->app_icon); + wAppIconPaint(aicon); + } else if (aicon->docked) { + aicon->running = 0; + if (aicon->dock->type == WM_DRAWER) + wDrawerFillTheGap(aicon->dock, aicon, True); + + wDockDetach(aicon->dock, aicon); } else { - wAppIconDestroy(wapp->app_icon); + wAppIconDestroy(aicon); } - wapp->app_icon = NULL; + aicon = NULL; if (wPreferences.auto_arrange_icons) wArrangeIcons(wapp->main_window_desc->screen_ptr, True); -- 1.7.10.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.