From 71002168d3ec3840cb268b01abad0b2400c0343f Mon Sep 17 00:00:00 2001
From: Bert Gijsbers <gijsbers@science.uva.nl>
Date: Thu, 30 May 2024 19:43:17 +0200
Subject: [PATCH] Warn if DESKTOP_SESSION is icewm instead of icewm-session.

---
 src/base.h    | 1 +
 src/wmapp.cc  | 2 ++
 src/yarray.cc | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/base.h b/src/base.h
index ed3d9b716..4bc2e761b 100644
--- a/src/base.h
+++ b/src/base.h
@@ -156,6 +156,7 @@ void show_backtrace(const int limit = 0);
 int strpcmp(char const *str, char const *pfx, char const *delim = "=:");
 const char* errno_string();
 const char *my_basename(const char *filename);
+bool strequal(const char* a, const char* b);
 
 inline const char* boolstr(bool bval) {
     return bval ? "true" : "false";
diff --git a/src/wmapp.cc b/src/wmapp.cc
index 5827128a5..7c9be6c96 100644
--- a/src/wmapp.cc
+++ b/src/wmapp.cc
@@ -1361,6 +1361,8 @@ YWMApp::YWMApp(int *argc, char ***argv, const char *displayName,
     delete desktop;
 
     managerWindow = registerProtocols1(*argv, *argc);
+    if (notifyParent == false && strequal("icewm", getenv("DESKTOP_SESSION")))
+        warn("Better start icewm via icewm-session");
 
     manager = new YWindowManager(this, this, this, nullptr, root());
     PRECONDITION(desktop != nullptr);
diff --git a/src/yarray.cc b/src/yarray.cc
index 73b47d38e..58dbffefc 100644
--- a/src/yarray.cc
+++ b/src/yarray.cc
@@ -213,7 +213,7 @@ YStringArray::YStringArray(const char* cstr[], SizeType num, SizeType cap) :
     }
 }
 
-static bool strequal(const char *a, const char *b) {
+bool strequal(const char* a, const char* b) {
     return a ? b && !strcmp(a, b) : !b;
 }