[hackers] [dwm] merged my changes || Anselm R Garbe

changeset: 1347:87771e5f517f
branch: merge
tag: tip
parent: 1346:2765f1a08494
parent: 1345:169467e68992
user: Anselm R Garbe <garbeam_AT_gmail.com>
date: Wed Aug 27 15:03:35 2008 +0100
files: dwm.c
description:
merged my changes

diff -r 2765f1a08494 -r 87771e5f517f dwm.c
--- a/dwm.c Wed Aug 27 12:52:44 2008 +0100
+++ b/dwm.c Wed Aug 27 15:03:35 2008 +0100
@@ -61,7 +61,7 @@
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
 enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
 
@@ -1326,7 +1326,6 @@
         /* init atoms */
         wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
         wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
         wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
         netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
         netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
@@ -1634,7 +1633,7 @@
 void
 updatetitle(Client *c) {
         if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
- gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+ gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
 }
 
 void
Received on Wed Aug 27 2008 - 14:03:43 UTC