1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-23 22:52:34 +01:00

Remove #ifdef NETWM_HINTS constructs

NETWM_HINT is always defined in src/wconfig.h.in, so
let's remove it from there too.
This commit is contained in:
Carlos R. Mafra
2009-10-12 00:08:21 +02:00
parent 347e804bb6
commit 15e37ff942
15 changed files with 21 additions and 131 deletions

View File

@@ -155,11 +155,9 @@ WIcon *wIconCreate(WWindow * wwin)
#else
icon->show_title = 1;
#endif
#ifdef NETWM_HINTS
if (!icon->image && !WFLAGP(wwin, always_user_icon))
icon->image = RRetainImage(wwin->net_icon_image);
if (!icon->image)
#endif
icon->image = wDefaultGetImage(scr, wwin->wm_instance, wwin->wm_class);
file = wDefaultGetIconFile(scr, wwin->wm_instance, wwin->wm_class, False);
@@ -583,11 +581,7 @@ void wIconUpdate(WIcon * icon)
XFreePixmap(dpy, icon->pixmap);
icon->pixmap = None;
if (wwin && (WFLAGP(wwin, always_user_icon)
#ifdef NETWM_HINTS
|| wwin->net_icon_image
#endif
))
if (wwin && (WFLAGP(wwin, always_user_icon) || wwin->net_icon_image))
goto user_icon;
/* use client specified icon window */