The function wAppIconCreate() is only used one time. Thsi patch removes the function and moves the code to the function that calls wAppIconCreate().
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- src/appicon.c | 65 +++++++++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/src/appicon.c b/src/appicon.c index f91f079..ea20c41 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -66,7 +66,6 @@ static void iconDblClick(WObjDescriptor * desc, XEvent * event); static void iconExpose(WObjDescriptor * desc, XEvent * event); static void wApplicationSaveIconPathFor(const char *iconPath, const char *wm_instance, const char *wm_class); -static WAppIcon *wAppIconCreate(WWindow * leader_win); static void add_to_appicon_list(WAppIcon *appicon); static void remove_from_appicon_list(WAppIcon *appicon); static void create_appicon_from_dock(WWindow *wwin, WApplication *wapp, Window main_window); @@ -154,7 +153,34 @@ void create_appicon_for_application(WApplication *wapp, WWindow *wwin) /* If app_icon was not found, create it */ if (!wapp->app_icon) { /* Create the icon */ - wapp->app_icon = wAppIconCreate(wapp->main_window_desc); + wapp->app_icon = wmalloc(sizeof(WAppIcon)); + wretain(wapp->app_icon); + wapp->app_icon->yindex = -1; + wapp->app_icon->xindex = -1; + wapp->app_icon->prev = NULL; + wapp->app_icon->next = NULL; + + if (wwin->wm_class) + wapp->app_icon->wm_class = wstrdup(wwin->wm_class); + + if (wwin->wm_instance) + wapp->app_icon->wm_instance = wstrdup(wwin->wm_instance); + + wapp->app_icon->icon = icon_create(NULL, wwin->wm_instance, wwin->wm_class, TILE_NORMAL); + icon_draw(wwin->screen_ptr, wapp->app_icon->icon, wwin->icon_x, wwin->icon_y, wwin); + +#ifdef XDND + wXDNDMakeAwareness(wapp->app_icon->icon->core->window); +#endif + + /* will be overriden if docked */ + wapp->app_icon->icon->core->descriptor.handle_mousedown = appIconMouseDown; + wapp->app_icon->icon->core->descriptor.handle_expose = iconExpose; + wapp->app_icon->icon->core->descriptor.parent_type = WCLASS_APPICON; + wapp->app_icon->icon->core->descriptor.parent = wapp->app_icon; + AddToStackList(wapp->app_icon->icon->core); + wapp->app_icon->icon->show_title = 0; + wIconUpdate(wapp->app_icon->icon); /* Now, paint the icon */ @@ -300,41 +326,6 @@ void removeAppIconFor(WApplication *wapp) wArrangeIcons(wapp->main_window_desc->screen_ptr, True); } -static WAppIcon *wAppIconCreate(WWindow *wwin) -{ - WAppIcon *aicon; - - aicon = wmalloc(sizeof(WAppIcon)); - wretain(aicon); - aicon->yindex = -1; - aicon->xindex = -1; - aicon->prev = NULL; - aicon->next = NULL; - - if (wwin->wm_class) - aicon->wm_class = wstrdup(wwin->wm_class); - - if (wwin->wm_instance) - aicon->wm_instance = wstrdup(wwin->wm_instance); - - aicon->icon = icon_create(NULL, wwin->wm_instance, wwin->wm_class, TILE_NORMAL); - icon_draw(wwin->screen_ptr, aicon->icon, wwin->icon_x, wwin->icon_y, wwin); - -#ifdef XDND - wXDNDMakeAwareness(aicon->icon->core->window); -#endif - - /* will be overriden if docked */ - aicon->icon->core->descriptor.handle_mousedown = appIconMouseDown; - aicon->icon->core->descriptor.handle_expose = iconExpose; - aicon->icon->core->descriptor.parent_type = WCLASS_APPICON; - aicon->icon->core->descriptor.parent = aicon; - AddToStackList(aicon->icon->core); - aicon->icon->show_title = 0; - - return aicon; -} - void wAppIconDestroy(WAppIcon *aicon) { RemoveFromStackList(aicon->icon->core); -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
