From 0fb90dacfa787d3875e6ee8d1e6d9d578e417d9d Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Fri, 6 Jun 2008 15:14:59 +0200
Subject: Minor cleanup.

---
 src/window.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/window.c b/src/window.c
index c5b5fbea..d2613569 100644
--- a/src/window.c
+++ b/src/window.c
@@ -992,22 +992,15 @@ unsigned int
 getProtocols (CompDisplay *display,
 	      Window      id)
 {
-    Atom	  actual;
-    int		  result, format;
-    unsigned long n, left;
-    unsigned char *data;
-    unsigned int  protocols = 0;
+    Atom         *protocol;
+    int          count;
+    unsigned int protocols = 0;
 
-    result = XGetWindowProperty (display->display, id, display->wmProtocolsAtom,
-				 0L, 20L, FALSE, XA_ATOM,
-				 &actual, &format, &n, &left, &data);
-
-    if (result == Success && n && data)
+    if (XGetWMProtocols (display->display, id, &protocol, &count))
     {
-	Atom *protocol = (Atom *) data;
 	int  i;
 
-	for (i = 0; i < n; i++)
+	for (i = 0; i < count; i++)
 	{
 	    if (protocol[i] == display->wmDeleteWindowAtom)
 		protocols |= CompWindowProtocolDeleteMask;
@@ -1019,7 +1012,7 @@ getProtocols (CompDisplay *display,
 		protocols |= CompWindowProtocolSyncRequestMask;
 	}
 
-	XFree (data);
+	XFree (protocol);
     }
 
     return protocols;
-- 
cgit v1.2.3