kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=36763cc7e2f81a2084b16f845a419881a8f7ef0b
commit 36763cc7e2f81a2084b16f845a419881a8f7ef0b Author: Kim Woelders <[email protected]> Date: Wed Dec 25 16:18:29 2019 +0100 windowmatches: Resurrect USE_ICON_IMAGE_FOR_CLIENT_() macros --- config/definitions | 18 +++--------------- src/windowmatch.c | 9 ++------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/config/definitions b/config/definitions index 1f3454af..19feedc9 100644 --- a/config/definitions +++ b/config/definitions @@ -626,35 +626,23 @@ __MATCH_WINDOW __BGN;\ __END #define USE_ICON_IMAGE_FOR_CLIENT_TITLE(title, image) \ -__ICLASS __BGN;\ - __NAME image"_ICLASS";\ - __NORMAL image;\ -__END;\ __MATCH_WINDOW __BGN;\ __NAME image"_MATCH";\ - __USE_ICON image"_ICLASS";\ + __USE_ICON image;\ __HAS_TITLE title;\ __END #define USE_ICON_IMAGE_FOR_CLIENT_NAME(name, image) \ -__ICLASS __BGN;\ - __NAME image"_ICLASS";\ - __NORMAL image;\ -__END;\ __MATCH_WINDOW __BGN;\ __NAME image"_MATCH";\ - __USE_ICON image"_ICLASS";\ + __USE_ICON image;\ __HAS_NAME name;\ __END #define USE_ICON_IMAGE_FOR_CLIENT_CLASS(class, image) \ -__ICLASS __BGN;\ - __NAME image"_ICLASS";\ - __NORMAL image;\ -__END;\ __MATCH_WINDOW __BGN;\ __NAME image"_MATCH";\ - __USE_ICON image"_ICLASS";\ + __USE_ICON image;\ __HAS_CLASS class;\ __END diff --git a/src/windowmatch.c b/src/windowmatch.c index 4a8f8d33..d3b15c69 100644 --- a/src/windowmatch.c +++ b/src/windowmatch.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2005-2018 Kim Woelders + * Copyright (C) 2005-2019 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -244,15 +244,10 @@ WindowMatchConfigLoad(FILE * fs) break; case WINDOWMATCH_ICON: -#if 0 /* This has not been active since at least 0.16.5 */ if (!wm) break; - wm->icon = ImageclassFind(s2, 0); - if (!wm->icon) - break; + wm->args = Estrdup(s2); wm->op = MATCH_OP_ICON; - wm->icon->ref_count++; -#endif break; case WINDOWMATCH_DESKTOP: --
