3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d70594..b8f55fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.13
 *05/05/06:
+  * xrestop should now display "Fluxbox" (Simon)
+    Ewmh.hh/cc
   * Fix potential segfault menu bug, thanks chenfeng (Simon)
     Menu.cc
   * Added more KeyActions to TextBox (thanx to Vadim <suhanov_vadim@mail.ru>
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index d6ccf36..843b8d2 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -92,7 +92,7 @@ void Ewmh::initForScreen(BScreen &screen) {
         XChangeProperty(disp, wincheck, m_net_supporting_wm_check, XA_WINDOW, 32,
                         PropModeReplace, (unsigned char *) &wincheck, 1);
 
-        XChangeProperty(disp, wincheck, m_net_wm_name, XA_STRING, 8,
+        XChangeProperty(disp, wincheck, m_net_wm_name, utf8_string, 8,
                         PropModeReplace, (unsigned char *) "Fluxbox", strlen("Fluxbox"));
     }
 
@@ -794,6 +794,7 @@ void Ewmh::createAtoms() {
     m_net_wm_handled_icons = XInternAtom(disp, "_NET_WM_HANDLED_ICONS", False);
 
     m_net_wm_ping = XInternAtom(disp, "_NET_WM_PING", False);
+    utf8_string = XInternAtom(disp, "UTF8_STRING", False);
 }
 
 
diff --git a/src/Ewmh.hh b/src/Ewmh.hh
index 61f0d10..b2b61b4 100644
--- a/src/Ewmh.hh
+++ b/src/Ewmh.hh
@@ -122,6 +122,8 @@ private:
     // application protocols
     Atom m_net_wm_ping;
 
+    Atom utf8_string;
+
     std::vector<Window> m_windows;
     typedef std::map<FluxboxWindow *, WindowState *> SavedState;
     SavedState m_savedstate;