From c95c4173a6ca9e25d3402229398c6906669d3e65 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Mon, 10 Sep 2007 16:49:54 +0200
Subject: [PATCH] remove NetWMName

---
 awesome.c | 1 -
 awesome.h | 2 +-
 client.c  | 2 +-
 event.c   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/awesome.c b/awesome.c
index 07fc5e8a..f8242c17 100644
--- a/awesome.c
+++ b/awesome.c
@@ -149,7 +149,6 @@ setup(Display *disp, awesome_config *awesomeconf)
 
     /* init atoms */
     netatom[NetSupported] = XInternAtom(disp, "_NET_SUPPORTED", False);
-    netatom[NetWMName] = XInternAtom(disp, "_NET_WM_NAME", False);
     XChangeProperty(disp, DefaultRootWindow(disp), netatom[NetSupported], XA_ATOM, 32,
                     PropModeReplace, (unsigned char *) netatom, NetLast);
     /* init cursors */
diff --git a/awesome.h b/awesome.h
index f710cc00..ff99f353 100644
--- a/awesome.h
+++ b/awesome.h
@@ -37,7 +37,7 @@
 enum
 { CurNormal, CurResize, CurMove, CurLast };     /* cursor */
 enum
-{ NetSupported, NetWMName, NetLast };   /* EWMH atoms */
+{ NetSupported, NetLast };   /* EWMH atoms */
 
 Bool gettextprop(Display *, Window, Atom, char *, unsigned int);   /* return text property, UTF-8 compliant */
 void updatebarpos(Display *, Statusbar);        /* updates the bar position */
diff --git a/client.c b/client.c
index 8875e191..efea6033 100644
--- a/client.c
+++ b/client.c
@@ -179,7 +179,7 @@ attach(Client * c)
 inline void
 updatetitle(Client * c)
 {
-    if(!gettextprop(c->display, c->win, netatom[NetWMName], c->name, sizeof c->name))
+    if(!gettextprop(c->display, c->win, XInternAtom(c->display, "_NET_WM_NAME", False), c->name, sizeof c->name))
         gettextprop(c->display, c->win, XInternAtom(c->display, "WM_NAME", False), c->name, sizeof c->name);
 }
 
diff --git a/event.c b/event.c
index ee13ba51..33d4eace 100644
--- a/event.c
+++ b/event.c
@@ -348,7 +348,7 @@ handle_event_propertynotify(XEvent * e, awesome_config *awesomeconf)
             updatesizehints(c);
             break;
         }
-        if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
+        if(ev->atom == XA_WM_NAME || ev->atom == XInternAtom(c->display, "_NET_WM_NAME", False))
         {
             updatetitle(c);
             if(c == sel)