Deprecate XCBSync, move to XCBAuxSync.

diff --git a/src/xcb.h b/src/xcb.h
index 8e990fd..c7084ff 100644 (file)
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -477,11 +477,11 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *display, XCBAuthInfo
  * @param e: A pointer to an error.
  * @return @c 1 on success, @c 0 otherwise.
  *
  * @param e: A pointer to an error.
  * @return @c 1 on success, @c 0 otherwise.
  *

- * Blocks the calling thread for the duration of one round trip to the
- * server, ensuring that all events and errors caused by previous
- * requests are available to XCB.
+ * @deprecated This function is deprecated. It must not be used in
+ * newly written code.  XCBFlush is more efficient.
+ * Use XCBAuxSync if absolutely necessary.

  */
  */

-int XCBSync(XCBConnection *c, XCBGenericError **e);
+int XCBSync(XCBConnection *c, XCBGenericError **e) deprecated;

 
 
 /**
 
 
 /**

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 06b5bca..f5c7cec 100644 (file)
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -239,6 +239,7 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
     return XCBConnectToFD(fd, auth);
 }
 
     return XCBConnectToFD(fd, auth);
 }
 

+/* backwards compatible interfaces: remove before 1.0 release */

 int XCBSync(XCBConnection *c, XCBGenericError **e)
 {
     XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
 int XCBSync(XCBConnection *c, XCBGenericError **e)
 {
     XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);


@@ -246,10 +247,6 @@ int XCBSync(XCBConnection *c, XCBGenericError **e)
     return reply != 0;
 }
 
     return reply != 0;
 }
 

-
-
-
-/* backwards compatible interfaces: remove before 1.0 release */

 XCBConnection *XCBConnectBasic()
 {
     XCBConnection *c = XCBConnect(0, 0);
 XCBConnection *XCBConnectBasic()
 {
     XCBConnection *c = XCBConnect(0, 0);