[Xcb-commit] xcb-util/wm Makefile.am,1.2,1.3 xcbwm-test.c,1.1,1.2

[Vincent Torri]

Update of /cvs/xcb/xcb-util/wm
In directory gabe:/tmp/cvs-serv30378

Modified Files:
	Makefile.am xcbwm-test.c 
Log Message:
XCBConnectBasic is deprecated and xcbint must not be used anymore

Index: xcbwm-test.c
===================================================================
RCS file: /cvs/xcb/xcb-util/wm/xcbwm-test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xcbwm-test.c	7 Mar 2005 03:58:37 -0000	1.1
+++ xcbwm-test.c	14 Jan 2006 11:32:45 -0000	1.2
@@ -5,8 +5,8 @@
 #include <assert.h>
 
 #include <X11/XCB/xcb.h>
-#include <X11/XCB/xcbint.h>
 #include "reply_formats.h"
+#include "xcb_aux.h"
 #include "xcb_event.h"
 #include "xcb_atom.h"
 #include "xcb_icccm.h"
@@ -180,12 +180,13 @@
 	PropertyHandlers *prophs;
 	XCBWINDOW root;
 	pthread_t event_thread;
+        int screen_nbr;
 	int i;
 
 	byChild = AllocTable();
 	byParent = AllocTable();
 
-	c = XCBConnectBasic();
+	c = XCBConnect(NULL, &screen_nbr);
 
 	evenths = allocEventHandlers(c);
 
@@ -207,7 +208,7 @@
 		pthread_create(&event_thread, 0, (void *(*)(void *))eventLoop, evenths);
 	}
 
-	root = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(c)).data->root;
+	root = XCBAuxGetScreen(c, screen_nbr)->root;
 
 	{
 		CARD32 mask = XCBCWEventMask;

Index: Makefile.am
===================================================================
RCS file: /cvs/xcb/xcb-util/wm/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	2 Apr 2005 13:41:27 -0000	1.2
+++ Makefile.am	14 Jan 2006 11:32:45 -0000	1.3
@@ -6,8 +6,9 @@
 xcbinclude_HEADERS = xcb_wm.h
 
 AM_CFLAGS = -Wall
-INCLUDES = $(XCB_CFLAGS) -I../atom -I../event -I../property -I../icccm
+INCLUDES = $(XCB_CFLAGS) -I../convenient -I../atom -I../event -I../property -I../icccm
 LDADD = $(XCB_LIBS) \
+	-L../convenient -lXCBAux \
 	-L../atom -lXCBAtom \
 	-L../event -lXCBEvent \
 	-L../property -lXCBProperty \