Patch to build against 0.8.15

For more information, refer to:
http://sector-5.net/archives/irssi-python-for-irssi-0-8-15/

7 files changed, 20 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 543d47d..3af145a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src scripts docs
+SUBDIRS = src scripts
 
 variables:
 	echo @PYTHON_CPPFLAGS@
diff --git a/configure.in b/configure.in
index 4405682..e49f64d 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 
 #AC_PREREQ(2.59)
 AC_INIT(irssi-python, test3, loafier@gmail.com)
-AC_CONFIG_SRCDIR([src/pyconstants.c])
+AC_CONFIG_SRCDIR([src/pycore.c])
 AC_CONFIG_HEADER([pyirssi-config.h])
 AM_INIT_AUTOMAKE([irssi-python], [test3])
 AM_DISABLE_STATIC
@@ -63,5 +63,5 @@ fi
 #AC_CONFIG_FILES([src/Makefile src/objects/Makefile])
 #AC_OUTPUT([Makefile src/Makefile src/objects/Makefile])
 #AC_OUTPUT([Makefile src/Makefile src/objects/Makefile])
-AC_CONFIG_FILES([Makefile scripts/Makefile docs/Makefile src/Makefile src/objects/Makefile])
+AC_CONFIG_FILES([Makefile scripts/Makefile  src/Makefile src/objects/Makefile])
 AC_OUTPUT
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}
 };
 
diff --git a/src/pyirssi.h b/src/pyirssi.h
index 1db4dfd..2dc4e45 100644
--- a/src/pyirssi.h
+++ b/src/pyirssi.h
@@ -2,7 +2,6 @@
 #define _PYIRSSI_H_
 
 #define MODULE_NAME "python"
-#include "config.h"
 #include "core.h"
 #include "common.h"
 #include "modules.h"
diff --git a/src/pymodule.c b/src/pymodule.c
index 0962bae..6322ffa 100644
--- a/src/pymodule.c
+++ b/src/pymodule.c
@@ -807,18 +807,17 @@ PyDoc_STRVAR(py_notifylist_add_doc,
 );
 static PyObject *py_notifylist_add(PyObject *self, PyObject *args, PyObject *kwds)
 {
-    static char *kwlist[] = {"mask", "ircnets", "away_check", "idle_check_time", NULL};
+    static char *kwlist[] = {"mask", "ircnets", "away_check", NULL};
     char *mask = "";
     char *ircnets = NULL;
     int away_check = 0;
-    int idle_check_time = 0;
     NOTIFYLIST_REC *rec;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|zii", kwlist, 
-           &mask, &ircnets, &away_check, &idle_check_time))
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|zi", kwlist, 
+           &mask, &ircnets, &away_check))
         return NULL;
 
-    rec = notifylist_add(mask, ircnets, away_check, idle_check_time);
+    rec = notifylist_add(mask, ircnets, away_check);
     if (rec)
         return pynotifylist_new(rec);
 
@@ -905,12 +904,13 @@ static PyObject *py_level2bits(PyObject *self, PyObject *args, PyObject *kwds)
 {
     static char *kwlist[] = {"level", NULL};
     char *level = "";
+    int error = 0;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, 
            &level))
         return NULL;
 
-    return PyLong_FromUnsignedLong(level2bits(level));
+    return PyLong_FromUnsignedLong(level2bits(level, &error));
 }
 
 PyDoc_STRVAR(py_bits2level_doc,