From 955e20356d63ed405198c8143617a8a0ca8bfc02 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit bf280726d5d22f33d33e4f9e771220c725249407. --- klaptopdaemon/xautolock_diy.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'klaptopdaemon/xautolock_diy.c') diff --git a/klaptopdaemon/xautolock_diy.c b/klaptopdaemon/xautolock_diy.c index b9df2f8..c816ae9 100644 --- a/klaptopdaemon/xautolock_diy.c +++ b/klaptopdaemon/xautolock_diy.c @@ -96,8 +96,8 @@ selectEvents (Window window, Bool substructureOnly) { Window root; /* root window of the window */ Window parent; /* parent of the window */ - Window* children; /* children of the window */ - unsigned nofChildren = 0; /* number of children */ + Window* tqchildren; /* tqchildren of the window */ + unsigned nofChildren = 0; /* number of tqchildren */ unsigned i; /* loop counter */ XWindowAttributes attribs; /* attributes of the window */ @@ -107,12 +107,12 @@ selectEvents (Window window, Bool substructureOnly) * Start by querying the server about the root and parent windows. */ if (!XQueryTree (queue.display, window, &root, &parent, - &children, &nofChildren)) + &tqchildren, &nofChildren)) { return; } - if (nofChildren) (void) XFree ((char*) children); + if (nofChildren) (void) XFree ((char*) tqchildren); /* * Build the appropriate event mask. The basic idea is that we don't @@ -168,7 +168,7 @@ selectEvents (Window window, Bool substructureOnly) } /* - * Now ask for the list of children again, since it might have changed + * Now ask for the list of tqchildren again, since it might have changed * in between the last time and us selecting SubstructureNotifyMask. * * There is a (very small) chance that we might process a subtree twice: @@ -179,20 +179,20 @@ selectEvents (Window window, Bool substructureOnly) * isn't required... */ if (!XQueryTree (queue.display, window, &root, &parent, - &children, &nofChildren)) + &tqchildren, &nofChildren)) { return; } /* - * Now do the same thing for all children. + * Now do the same thing for all tqchildren. */ for (i = 0; i < nofChildren; ++i) { - selectEvents (children[i], substructureOnly); + selectEvents (tqchildren[i], substructureOnly); } - if (nofChildren) (void) XFree ((char*) children); + if (nofChildren) (void) XFree ((char*) tqchildren); } #if 0 -- cgit v1.2.1