summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2010-01-19 22:04:24 +0100
committerEamon Walsh <efw@eamonwalsh.com>2010-01-24 19:20:57 -0500
commitecc99450328c4bf38858662fc262a721dd997188 (patch)
tree7a18cde47c00f691f464be899fbb2ee384a5d7c8
parent4bde7d1effe4bd40aeced868a635a7d1543ee9d7 (diff)
Rename reply to reply_type.
Signed-off-by: Julien Danjou <julien@danjou.info>
-rw-r--r--src/cookie.c4
-rw-r--r--src/cookie.h2
-rw-r--r--src/ext.c2
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);