[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xcb
Subject:    [Xcb] [PATCH 1/3] Rename reply to reply_type.
From:       Julien Danjou <julien () danjou ! info>
Date:       2010-01-19 21:04:24
Message-ID: 1263935066-28963-2-git-send-email-julien () danjou ! info
[Download RAW message or body]

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 src/cookie.c |    4 ++--
 src/cookie.h |    2 +-
 src/ext.c    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cookie.c b/src/cookie.c
index d69d76b..db0a20f 100644
--- a/src/cookie.c
+++ b/src/cookie.c
@@ -23,7 +23,7 @@ xpybCookie_new(PyTypeObject *self, PyObject *args, PyObject *kw)
 static void
 xpybCookie_dealloc(xpybCookie *self)
 {
-    Py_CLEAR(self->reply);
+    Py_CLEAR(self->reply_type);
     Py_CLEAR(self->request);
     Py_CLEAR(self->conn);
     self->ob_type->tp_free((PyObject *)self);
@@ -88,7 +88,7 @@ xpybCookie_reply(xpybCookie *self, PyObject *args)
 	goto err1;
 
     /* Call the reply type object to get a new xcb.Reply instance */
-    reply = PyObject_CallFunctionObjArgs((PyObject *)self->reply, shim, NULL);
+    reply = PyObject_CallFunctionObjArgs((PyObject *)self->reply_type, shim, NULL);
     Py_DECREF(shim);
     return reply;
 err1:
diff --git a/src/cookie.h b/src/cookie.h
index eae9a84..b00e999 100644
--- a/src/cookie.h
+++ b/src/cookie.h
@@ -9,7 +9,7 @@ typedef struct {
     PyObject_HEAD
     xpybConn *conn;
     xpybRequest *request;
-    PyTypeObject *reply;
+    PyTypeObject *reply_type;
     xcb_void_cookie_t cookie;
 } xpybCookie;
 
diff --git a/src/ext.c b/src/ext.c
index 0bd7aee..2d622d9 100644
--- a/src/ext.c
+++ b/src/ext.c
@@ -134,7 +134,7 @@ xpybExt_send_request(xpybExt *self, PyObject *args, PyObject *kw)
     /* Set up cookie */
     Py_INCREF(cookie->conn = self->conn);
     Py_INCREF((PyObject *)(cookie->request = request));
-    Py_XINCREF(cookie->reply = reply);
+    Py_XINCREF(cookie->reply_type = reply);
     cookie->cookie.sequence = seq;
 
     Py_INCREF(cookie);
-- 
1.6.6

_______________________________________________
Xcb mailing list
Xcb@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xcb
[prev in list] [next in list] [prev in thread] [next in thread]