From 29637ceae35271c44a44a671b86caa149ef1880e Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Fri, 2 Mar 2012 20:11:55 -0500 Subject: Patch to build against 0.8.15 For more information, refer to: http://sector-5.net/archives/irssi-python-for-irssi-0-8-15/ --- src/objects/irc-server-object.c | 18 ++++++++++-------- src/objects/netsplit-channel-object.c | 2 +- src/objects/notifylist-object.c | 11 ----------- 3 files changed, 11 insertions(+), 20 deletions(-) (limited to 'src/objects') diff --git a/src/objects/irc-server-object.c b/src/objects/irc-server-object.c index 268dcbf..d4d8596 100644 --- a/src/objects/irc-server-object.c +++ b/src/objects/irc-server-object.c @@ -389,17 +389,18 @@ PyDoc_STRVAR(PyIrcServer_redirect_get_signal_doc, ); static PyObject *PyIrcServer_redirect_get_signal(PyIrcServer *self, PyObject *args, PyObject *kwds) { - static char *kwlist[] = {"event", "args", NULL}; + static char *kwlist[] = {"prefix", "event", "args", NULL}; + char *prefix = ""; char *event = ""; char *pargs = ""; RET_NULL_IF_INVALID(self->data); - if (!PyArg_ParseTupleAndKeywords(args, kwds, "ss", kwlist, - &event, &pargs)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "sss", kwlist, + &prefix, &event, &pargs)) return NULL; - RET_AS_STRING_OR_NONE(server_redirect_get_signal(self->data, event, pargs)); + RET_AS_STRING_OR_NONE(server_redirect_get_signal(self->data, prefix, event, pargs)); } PyDoc_STRVAR(PyIrcServer_redirect_peek_signal_doc, @@ -407,18 +408,19 @@ PyDoc_STRVAR(PyIrcServer_redirect_peek_signal_doc, ); static PyObject *PyIrcServer_redirect_peek_signal(PyIrcServer *self, PyObject *args, PyObject *kwds) { - static char *kwlist[] = {"event", "args", NULL}; + static char *kwlist[] = {"prefix", "event", "args", NULL}; + char *prefix = ""; char *event = ""; char *pargs = ""; int redirection; RET_NULL_IF_INVALID(self->data); - if (!PyArg_ParseTupleAndKeywords(args, kwds, "ss", kwlist, - &event, &pargs)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "sss", kwlist, + &prefix, &event, &pargs)) return NULL; - RET_AS_STRING_OR_NONE(server_redirect_peek_signal(self->data, event, pargs, &redirection)); + RET_AS_STRING_OR_NONE(server_redirect_peek_signal(self->data, prefix, event, pargs, &redirection)); } /* Methods for object */ diff --git a/src/objects/netsplit-channel-object.c b/src/objects/netsplit-channel-object.c index 6cf0db5..c483df2 100644 --- a/src/objects/netsplit-channel-object.c +++ b/src/objects/netsplit-channel-object.c @@ -171,7 +171,7 @@ PyObject *pynetsplit_channel_new(void *netsplit) pynetsplit->name = name; pynetsplit->op = rec->op; pynetsplit->halfop = rec->halfop; - pynetsplit->other = rec->other; + pynetsplit->other = 0; return (PyObject *)pynetsplit; } diff --git a/src/objects/notifylist-object.c b/src/objects/notifylist-object.c index 3fc464d..50804f7 100644 --- a/src/objects/notifylist-object.c +++ b/src/objects/notifylist-object.c @@ -77,23 +77,12 @@ static PyObject *PyNotifylist_away_check_get(PyNotifylist *self, void *closure) return PyBool_FromLong(NOTIFYLIST(self->data)->away_check); } -PyDoc_STRVAR(PyNotifylist_idle_check_time_doc, - "Notify when idle time is reset and idle was bigger than this (seconds)" -); -static PyObject *PyNotifylist_idle_check_time_get(PyNotifylist *self, void *closure) -{ - RET_NULL_IF_INVALID(self->data); - return PyLong_FromUnsignedLong(NOTIFYLIST(self->data)->idle_check_time); -} - /* specialized getters/setters */ static PyGetSetDef PyNotifylist_getseters[] = { {"mask", (getter)PyNotifylist_mask_get, NULL, PyNotifylist_mask_doc, NULL}, {"away_check", (getter)PyNotifylist_away_check_get, NULL, PyNotifylist_away_check_doc, NULL}, - {"idle_check_time", (getter)PyNotifylist_idle_check_time_get, NULL, - PyNotifylist_idle_check_time_doc, NULL}, {NULL} }; -- cgit