[PATCH 37/40] Remove function icon_create_for_wwindow

[kix]

This patch removes the function icon_create_for_wwindow()
because the function has only two lines. These lines are moved
to the function wAppIconCreate() and the function is removed.

Signed-off-by: Rodolfo García Peñas (kix) <k...@kix.es>
---
 src/actions.c |  4 +++-
 src/appicon.c | 14 ++++++++------
 src/icon.c    | 10 ----------
 src/icon.h    |  1 -
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/actions.c b/src/actions.c
index 17dc965..a60dc79 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1086,7 +1086,9 @@ void wIconifyWindow(WWindow * wwin)
                if (!wwin->flags.icon_moved)
                        PlaceIcon(wwin->screen_ptr, &wwin->icon_x, 
&wwin->icon_y, wGetHeadForWindow(wwin));
 
-               wwin->icon = icon_create_for_wwindow(wwin);
+               wwin->icon = icon_create(NULL, wwin->wm_instance, 
wwin->wm_class, TILE_NORMAL);
+               icon_draw(wwin->screen_ptr, wwin->icon, wwin->icon_x, 
wwin->icon_y, wwin);
+
                wwin->icon->mapped = 1;
        }
 
diff --git a/src/appicon.c b/src/appicon.c
index e8afac1..f91f079 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -300,7 +300,7 @@ void removeAppIconFor(WApplication *wapp)
                wArrangeIcons(wapp->main_window_desc->screen_ptr, True);
 }
 
-static WAppIcon *wAppIconCreate(WWindow *leader_win)
+static WAppIcon *wAppIconCreate(WWindow *wwin)
 {
        WAppIcon *aicon;
 
@@ -311,13 +311,15 @@ static WAppIcon *wAppIconCreate(WWindow *leader_win)
        aicon->prev = NULL;
        aicon->next = NULL;
 
-       if (leader_win->wm_class)
-               aicon->wm_class = wstrdup(leader_win->wm_class);
+       if (wwin->wm_class)
+               aicon->wm_class = wstrdup(wwin->wm_class);
 
-       if (leader_win->wm_instance)
-               aicon->wm_instance = wstrdup(leader_win->wm_instance);
+       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);
 
-       aicon->icon = icon_create_for_wwindow(leader_win);
 #ifdef XDND
        wXDNDMakeAwareness(aicon->icon->core->window);
 #endif
diff --git a/src/icon.c b/src/icon.c
index eb9aad3..9234da8 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -162,16 +162,6 @@ void icon_draw(WScreen *scr, WIcon *icon, int x, int y, 
WWindow *wwin)
        WMAddNotificationObserver(tileObserver, icon, 
WNIconTileSettingsChanged, icon);
 }
 
-WIcon *icon_create_for_wwindow(WWindow *wwin)
-{
-       WIcon *icon;
-
-       icon = icon_create(NULL, wwin->wm_instance, wwin->wm_class, 
TILE_NORMAL);
-       icon_draw(wwin->screen_ptr, icon, wwin->icon_x, wwin->icon_y, wwin);
-
-       return icon;
-}
-
 static WIcon *icon_create_core(void)
 {
        WIcon *icon;
diff --git a/src/icon.h b/src/icon.h
index c1f0226..4403130 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_wwindow(WWindow *wwin);
 void icon_draw(WScreen *scr, WIcon *icon, int x, int y, WWindow *wwin);
 
 void set_icon_image_from_database(WIcon *icon, const char *wm_instance, const 
char *wm_class, const char *command);
-- 
1.8.4.rc3


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.