diff options
| author | Christopher Davis <loafier@gmail.com> | 2006-08-17 02:24:45 +0000 |
|---|---|---|
| committer | Christopher Davis <loafier@gmail.com> | 2006-08-17 02:24:45 +0000 |
| commit | fbad6a9f89e360727e42820250c8bdbc8e820743 (patch) | |
| tree | 25e11ce750e4b550d2a07781b15e4119a6391d2d | |
| parent | 31d5cc05e5d42fe36875efee92cdf3a4f203636f (diff) | |
| download | irssi-python-fbad6a9f89e360727e42820250c8bdbc8e820743.tar.gz irssi-python-fbad6a9f89e360727e42820250c8bdbc8e820743.tar.xz irssi-python-fbad6a9f89e360727e42820250c8bdbc8e820743.zip | |
test2
git-svn-id: http://svn.irssi.org/repos/irssi-python@4318 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | INSTALL | 13 | ||||
| -rw-r--r-- | README | 16 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | docs/irssi-python.html | 284 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/pycore.c | 33 | ||||
| -rw-r--r-- | src/pycore.h | 4 | ||||
| -rw-r--r-- | src/pyirssi.h | 2 |
10 files changed, 198 insertions, 180 deletions
@@ -0,0 +1,9 @@ +loafier, 2006-08-14: + first release, test1 + +loafier, 2006-08-16: + second release, test2 + fixed up links in irssi-python.html + changed intstallation location of docs (irssi/docs/irssi-python.html -> doc/irssi/irssi-python.html) + added online help document ( -> irssi/help/py) + changed name of shared library from libirssi_python.so to libpython.so @@ -1,8 +1,11 @@ +Prior to building irssi-python, you'll need Python 2.4, glib 2.0, and Irssi +installed. + 1. Download and unpack the irssi source (ie irssi-0.8.10a.tar.gz) if you haven't done so already. irssi-python will need access to Irssi's headers. 2. Run the configure script, making sure to specify the correct location of - Irssi's distribution. For example: + Irssi's distribution with the --with-irssi switch. For example: $ configure --with-irssi=~/irssi-0.8.10 @@ -16,12 +19,12 @@ 3. As usual, run make. -4. make install if OK. libirssi_python.so should be copied to irssi/modules/, - scripts to irssi/scripts/ and irssi-python.html to irssi/docs/. +4. make install if OK. libpython.so should be copied to irssi/modules/, + scripts to irssi/scripts/ and irssi-python.html to doc/irssi/. -5. You should be able to load irssi_python in Irssi after installing, IE: +5. You should be able to load the module in Irssi after installing, IE: - /load irssi_python + /load python If you get missing pthread symbols, you may have to preload the thread safe C library before running irssi. export LD_PRELOAD=/usr/lib/libc_r.so seems to @@ -1,4 +1,4 @@ -irssi-python test1 +irssi-python test2 irssi-python embeds Python into an Irssi module, providing most of the functionality of the Perl wrapper to Python scripts using a similar interface. @@ -6,16 +6,16 @@ Read INSTALL for setup instructions. Currently, all of the objects and functions are accessible through the irssi module. See docs/irssi-python.html for a listing. Basic docs are also available -online in Irssi, as well. Use the /pyexec command to send commands to the Python +online in Irssi, as well. Use the /py exec command to send commands to the Python interpreter while in Irssi. This will print help for the Window object: - /pyexec import irssi - /pyexec help(irssi.Window) + /py exec import irssi + /py exec help(irssi.Window) -Other commands (XXX: change these to /py <cmd>): - /pyload load a Python script - /pyunload unload a Python script - /pylist list loaded scripts +Other commands: + /py load load a Python script + /py unload unload a Python script + /py list list loaded scripts @@ -1,6 +1,3 @@ --- Change commands from py<cmd> to py <cmd> (add space), and add help - documentation. - -- Fix loader to handle module hierarchies better. -- Add more example scripts. diff --git a/configure.in b/configure.in index 0a0e885..8482e81 100644 --- a/configure.in +++ b/configure.in @@ -2,10 +2,10 @@ # Process this file with autoconf to produce a configure script. #AC_PREREQ(2.59) -AC_INIT(irssi-python, test1, loafier@gmail.com) +AC_INIT(irssi-python, test2, loafier@gmail.com) AC_CONFIG_SRCDIR([src/pyconstants.c]) AC_CONFIG_HEADER([pyirssi-config.h]) -AM_INIT_AUTOMAKE([irssi-python], [test1]) +AM_INIT_AUTOMAKE([irssi-python], [test2]) AM_DISABLE_STATIC AM_PROG_LIBTOOL diff --git a/docs/irssi-python.html b/docs/irssi-python.html index 998a763..a28f381 100644 --- a/docs/irssi-python.html +++ b/docs/irssi-python.html @@ -17,7 +17,7 @@ <font color="#fffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr> <tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> -<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="_irssi.html">_irssi</a><br> +<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="_irssi-python.html">_irssi</a><br> </td><td width="25%" valign=top><a href="sys.html">sys</a><br> </td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> @@ -30,68 +30,68 @@ <dt><font face="helvetica, arial"><a href="__builtin__.html#object">__builtin__.object</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#Ban">Ban</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Command">Command</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Ignore">Ignore</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#IrssiBase">IrssiBase</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Ban">Ban</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Command">Command</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Ignore">Ignore</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#IrssiBase">IrssiBase</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#Dcc">Dcc</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Dcc">Dcc</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#DccChat">DccChat</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#DccGet">DccGet</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#DccSend">DccSend</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#DccChat">DccChat</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#DccGet">DccGet</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#DccSend">DccSend</a> </font></dt></dl> </dd> -<dt><font face="helvetica, arial"><a href="irssi.html#IrssiChatBase">IrssiChatBase</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#Chatnet">Chatnet</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Connect">Connect</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Chatnet">Chatnet</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Connect">Connect</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#IrcConnect">IrcConnect</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#IrcConnect">IrcConnect</a> </font></dt></dl> </dd> -<dt><font face="helvetica, arial"><a href="irssi.html#Nick">Nick</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Server">Server</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Nick">Nick</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Server">Server</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#IrcServer">IrcServer</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#IrcServer">IrcServer</a> </font></dt></dl> </dd> -<dt><font face="helvetica, arial"><a href="irssi.html#WindowItem">WindowItem</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#WindowItem">WindowItem</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#Channel">Channel</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Channel">Channel</a> </font></dt><dd> <dl> -<dt><font face="helvetica, arial"><a href="irssi.html#IrcChannel">IrcChannel</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#IrcChannel">IrcChannel</a> </font></dt></dl> </dd> -<dt><font face="helvetica, arial"><a href="irssi.html#Query">Query</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Query">Query</a> </font></dt></dl> </dd> </dl> </dd> </dl> </dd> -<dt><font face="helvetica, arial"><a href="irssi.html#Log">Log</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Logitem">Logitem</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#MainWindow">MainWindow</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Netsplit">Netsplit</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#NetsplitChannel">NetsplitChannel</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#NetsplitServer">NetsplitServer</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Notifylist">Notifylist</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Process">Process</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Rawlog">Rawlog</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Reconnect">Reconnect</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Script">Script</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#StatusbarItem">StatusbarItem</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#TextDest">TextDest</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Theme">Theme</a> -</font></dt><dt><font face="helvetica, arial"><a href="irssi.html#Window">Window</a> +<dt><font face="helvetica, arial"><a href="irssi-python.html#Log">Log</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Logitem">Logitem</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#MainWindow">MainWindow</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Netsplit">Netsplit</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#NetsplitChannel">NetsplitChannel</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#NetsplitServer">NetsplitServer</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Notifylist">Notifylist</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Process">Process</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Rawlog">Rawlog</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Reconnect">Reconnect</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Script">Script</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#StatusbarItem">StatusbarItem</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#TextDest">TextDest</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Theme">Theme</a> +</font></dt><dt><font face="helvetica, arial"><a href="irssi-python.html#Window">Window</a> </font></dt></dl> </dd> </dl> @@ -117,16 +117,16 @@ <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Channel">class <strong>Channel</strong></a>(<a href="irssi.html#WindowItem">WindowItem</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Channel">class <strong>Channel</strong></a>(<a href="irssi-python.html#WindowItem">WindowItem</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyChannel objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Channel">Channel</a></dd> -<dd><a href="irssi.html#WindowItem">WindowItem</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Channel">Channel</a></dd> +<dd><a href="irssi-python.html#WindowItem">WindowItem</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -182,7 +182,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>wholist</strong> = <attribute 'wholist' of 'irssi.Channel' objects><dd><tt>/WHO list has been received</tt></dl> <hr> -Methods inherited from <a href="irssi.html#WindowItem">WindowItem</a>:<br> +Methods inherited from <a href="irssi-python.html#WindowItem">WindowItem</a>:<br> <dl><dt><a name="Channel-activity"><strong>activity</strong></a>(...)</dt><dd><tt><a href="#Channel-activity">activity</a>(data_level, hilight_color) -> None</tt></dd></dl> <dl><dt><a name="Channel-change_server"><strong>change_server</strong></a>(...)</dt><dd><tt><a href="#Channel-change_server">change_server</a>(server) -> None<br> @@ -224,7 +224,7 @@ Set window item active</tt></dd></dl> Return parent window for window item</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#WindowItem">WindowItem</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#WindowItem">WindowItem</a>:<br> <dl><dt><strong>createtime</strong> = <attribute 'createtime' of 'irssi.WindowItem' objects><dd><tt>Time the witem was created</tt></dl> <dl><dt><strong>data_level</strong> = <attribute 'data_level' of 'irssi.WindowItem' objects><dd><tt>0=no new data, 1=text, 2=msg, 3=highlighted text</tt></dl> @@ -236,7 +236,7 @@ Data and other attributes inherited from <a href="irssi.html#WindowItem">WindowI <dl><dt><strong>server</strong> = <attribute 'server' of 'irssi.WindowItem' objects><dd><tt>Active name for item</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Channel-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -244,7 +244,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -255,15 +255,15 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Chatnet">class <strong>Chatnet</strong></a>(<a href="irssi.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Chatnet">class <strong>Chatnet</strong></a>(<a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyChatnet objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Chatnet">Chatnet</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Chatnet">Chatnet</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -281,7 +281,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>username</strong> = <attribute 'username' of 'irssi.Chatnet' objects><dd><tt>if not empty, username preferred in this network</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Chatnet-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -289,7 +289,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -316,15 +316,15 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Connect">class <strong>Connect</strong></a>(<a href="irssi.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Connect">class <strong>Connect</strong></a>(<a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyConnect objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Connect">Connect</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Connect">Connect</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -344,7 +344,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>wanted_nick</strong> = <attribute 'wanted_nick' of 'irssi.Connect' objects><dd><tt><a href="#Nick">Nick</a> which we would prefer to use</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Connect-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -352,7 +352,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -363,14 +363,14 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Dcc">class <strong>Dcc</strong></a>(<a href="irssi.html#IrssiBase">IrssiBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Dcc">class <strong>Dcc</strong></a>(<a href="irssi-python.html#IrssiBase">IrssiBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyDcc objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Dcc">Dcc</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Dcc">Dcc</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -416,7 +416,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>transfd</strong> = <attribute 'transfd' of 'irssi.Dcc' objects><dd><tt>Bytes transferred</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Dcc-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> @@ -429,15 +429,15 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="DccChat">class <strong>DccChat</strong></a>(<a href="irssi.html#Dcc">Dcc</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="DccChat">class <strong>DccChat</strong></a>(<a href="irssi-python.html#Dcc">Dcc</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyDccChat objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#DccChat">DccChat</a></dd> -<dd><a href="irssi.html#Dcc">Dcc</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#DccChat">DccChat</a></dd> +<dd><a href="irssi-python.html#Dcc">Dcc</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -455,7 +455,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>mirc_ctcp</strong> = <attribute 'mirc_ctcp' of 'irssi.DccChat' objects><dd><tt>Send CTCPs without the CTCP_MESSAGE prefix</tt></dl> <hr> -Methods inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> +Methods inherited from <a href="irssi-python.html#Dcc">Dcc</a>:<br> <dl><dt><a name="DccChat-close"><strong>close</strong></a>(...)</dt><dd><tt><a href="#DccChat-close">close</a>() -> None<br> <br> Close and destroy DCC connection.</tt></dd></dl> @@ -469,7 +469,7 @@ Destroy DCC connection</tt></dd></dl> ?</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#Dcc">Dcc</a>:<br> <dl><dt><strong>addr</strong> = <attribute 'addr' of 'irssi.Dcc' objects><dd><tt>Other side's IP address.</tt></dl> <dl><dt><strong>arg</strong> = <attribute 'arg' of 'irssi.Dcc' objects><dd><tt>Given argument .. file name usually</tt></dl> @@ -497,7 +497,7 @@ Data and other attributes inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> <dl><dt><strong>transfd</strong> = <attribute 'transfd' of 'irssi.Dcc' objects><dd><tt>Bytes transferred</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#DccChat-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> @@ -510,15 +510,15 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="DccGet">class <strong>DccGet</strong></a>(<a href="irssi.html#Dcc">Dcc</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="DccGet">class <strong>DccGet</strong></a>(<a href="irssi-python.html#Dcc">Dcc</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyDccGet objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#DccGet">DccGet</a></dd> -<dd><a href="irssi.html#Dcc">Dcc</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#DccGet">DccGet</a></dd> +<dd><a href="irssi-python.html#Dcc">Dcc</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -534,7 +534,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>skipped</strong> = <attribute 'skipped' of 'irssi.DccGet' objects><dd><tt>Bytes skipped from start (resuming file)</tt></dl> <hr> -Methods inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> +Methods inherited from <a href="irssi-python.html#Dcc">Dcc</a>:<br> <dl><dt><a name="DccGet-close"><strong>close</strong></a>(...)</dt><dd><tt><a href="#DccGet-close">close</a>() -> None<br> <br> Close and destroy DCC connection.</tt></dd></dl> @@ -548,7 +548,7 @@ Destroy DCC connection</tt></dd></dl> ?</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#Dcc">Dcc</a>:<br> <dl><dt><strong>addr</strong> = <attribute 'addr' of 'irssi.Dcc' objects><dd><tt>Other side's IP address.</tt></dl> <dl><dt><strong>arg</strong> = <attribute 'arg' of 'irssi.Dcc' objects><dd><tt>Given argument .. file name usually</tt></dl> @@ -576,7 +576,7 @@ Data and other attributes inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> <dl><dt><strong>transfd</strong> = <attribute 'transfd' of 'irssi.Dcc' objects><dd><tt>Bytes transferred</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#DccGet-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> @@ -589,15 +589,15 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="DccSend">class <strong>DccSend</strong></a>(<a href="irssi.html#Dcc">Dcc</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="DccSend">class <strong>DccSend</strong></a>(<a href="irssi-python.html#Dcc">Dcc</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyDccSend objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#DccSend">DccSend</a></dd> -<dd><a href="irssi.html#Dcc">Dcc</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#DccSend">DccSend</a></dd> +<dd><a href="irssi-python.html#Dcc">Dcc</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -613,7 +613,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>waitforend</strong> = <attribute 'waitforend' of 'irssi.DccSend' objects><dd><tt>File is sent, just wait for the replies from the other side</tt></dl> <hr> -Methods inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> +Methods inherited from <a href="irssi-python.html#Dcc">Dcc</a>:<br> <dl><dt><a name="DccSend-close"><strong>close</strong></a>(...)</dt><dd><tt><a href="#DccSend-close">close</a>() -> None<br> <br> Close and destroy DCC connection.</tt></dd></dl> @@ -627,7 +627,7 @@ Destroy DCC connection</tt></dd></dl> ?</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#Dcc">Dcc</a>:<br> <dl><dt><strong>addr</strong> = <attribute 'addr' of 'irssi.Dcc' objects><dd><tt>Other side's IP address.</tt></dl> <dl><dt><strong>arg</strong> = <attribute 'arg' of 'irssi.Dcc' objects><dd><tt>Given argument .. file name usually</tt></dl> @@ -655,7 +655,7 @@ Data and other attributes inherited from <a href="irssi.html#Dcc">Dcc</a>:<br> <dl><dt><strong>transfd</strong> = <attribute 'transfd' of 'irssi.Dcc' objects><dd><tt>Bytes transferred</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#DccSend-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> @@ -710,17 +710,17 @@ Data and other attributes defined here:<br> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="IrcChannel">class <strong>IrcChannel</strong></a>(<a href="irssi.html#Channel">Channel</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="IrcChannel">class <strong>IrcChannel</strong></a>(<a href="irssi-python.html#Channel">Channel</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyIrcChannel objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#IrcChannel">IrcChannel</a></dd> -<dd><a href="irssi.html#Channel">Channel</a></dd> -<dd><a href="irssi.html#WindowItem">WindowItem</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#IrcChannel">IrcChannel</a></dd> +<dd><a href="irssi-python.html#Channel">Channel</a></dd> +<dd><a href="irssi-python.html#WindowItem">WindowItem</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -742,7 +742,7 @@ Remove a new ban from channel.</tt></dd></dl> Returns a list of bans in the channel.</tt></dd></dl> <hr> -Methods inherited from <a href="irssi.html#Channel">Channel</a>:<br> +Methods inherited from <a href="irssi-python.html#Channel">Channel</a>:<br> <dl><dt><a name="IrcChannel-nick_find"><strong>nick_find</strong></a>(...)</dt><dd><tt><a href="#IrcChannel-nick_find">nick_find</a>(nick) -> <a href="#Nick">Nick</a> <a href="__builtin__.html#object">object</a> or None<br> <br> Find nick from nicklist.</tt></dd></dl> @@ -764,7 +764,7 @@ Return a list of nicks in the channel.</tt></ Find nick mask from nicklist, wildcards allowed.</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#Channel">Channel</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#Channel">Channel</a>:<br> <dl><dt><strong>chanop</strong> = <attribute 'chanop' of 'irssi.Channel' objects><dd><tt>You are channel operator</tt></dl> <dl><dt><strong>joined</strong> = <attribute 'joined' of 'irssi.Channel' objects><dd><tt>JOIN event for this channel has been received</tt></dl> @@ -794,7 +794,7 @@ Data and other attributes inherited from <a href="irssi.html#Channel">Channel</a <dl><dt><strong>wholist</strong> = <attribute 'wholist' of 'irssi.Channel' objects><dd><tt>/WHO list has been received</tt></dl> <hr> -Methods inherited from <a href="irssi.html#WindowItem">WindowItem</a>:<br> +Methods inherited from <a href="irssi-python.html#WindowItem">WindowItem</a>:<br> <dl><dt><a name="IrcChannel-activity"><strong>activity</strong></a>(...)</dt><dd><tt><a href="#IrcChannel-activity">activity</a>(data_level, hilight_color) -> None</tt></dd></dl> <dl><dt><a name="IrcChannel-change_server"><strong>change_server</strong></a>(...)</dt><dd><tt><a href="#IrcChannel-change_server">change_server</a>(server) -> None<br> @@ -836,7 +836,7 @@ Set window item active</tt></dd></dl> Return parent window for window item</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#WindowItem">WindowItem</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#WindowItem">WindowItem</a>:<br> <dl><dt><strong>createtime</strong> = <attribute 'createtime' of 'irssi.WindowItem' objects><dd><tt>Time the witem was created</tt></dl> <dl><dt><strong>data_level</strong> = <attribute 'data_level' of 'irssi.WindowItem' objects><dd><tt>0=no new data, 1=text, 2=msg, 3=highlighted text</tt></dl> @@ -848,7 +848,7 @@ Data and other attributes inherited from <a href="irssi.html#WindowItem">WindowI <dl><dt><strong>server</strong> = <attribute 'server' of 'irssi.WindowItem' objects><dd><tt>Active name for item</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#IrcChannel-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -856,7 +856,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -867,16 +867,16 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="IrcConnect">class <strong>IrcConnect</strong></a>(<a href="irssi.html#Connect">Connect</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="IrcConnect">class <strong>IrcConnect</strong></a>(<a href="irssi-python.html#Connect">Connect</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyIrcConnect objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#IrcConnect">IrcConnect</a></dd> -<dd><a href="irssi.html#Connect">Connect</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#IrcConnect">IrcConnect</a></dd> +<dd><a href="irssi-python.html#Connect">Connect</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -884,7 +884,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>alternate_nick</strong> = <attribute 'alternate_nick' of 'irssi.IrcConnect' objects><dd><tt>Alternate nick to use if default nick is taken</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#Connect">Connect</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#Connect">Connect</a>:<br> <dl><dt><strong>address</strong> = <attribute 'address' of 'irssi.Connect' objects><dd><tt>Address where we connected (irc.blah.org)</tt></dl> <dl><dt><strong>chatnet</strong> = <attribute 'chatnet' of 'irssi.Connect' objects><dd><tt>Chat network</tt></dl> @@ -900,7 +900,7 @@ Data and other attributes inherited from <a href="irssi.html#Connect">Connect</a <dl><dt><strong>wanted_nick</strong> = <attribute 'wanted_nick' of 'irssi.Connect' objects><dd><tt><a href="#Nick">Nick</a> which we would prefer to use</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#IrcConnect-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -908,7 +908,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -919,16 +919,16 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="IrcServer">class <strong>IrcServer</strong></a>(<a href="irssi.html#Server">Server</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="IrcServer">class <strong>IrcServer</strong></a>(<a href="irssi-python.html#Server">Server</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyIrcServer objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#IrcServer">IrcServer</a></dd> -<dd><a href="irssi.html#Server">Server</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#IrcServer">IrcServer</a></dd> +<dd><a href="irssi-python.html#Server">Server</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -1036,7 +1036,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>usermode</strong> = <attribute 'usermode' of 'irssi.IrcServer' objects><dd><tt>User mode in server</tt></dl> <hr> -Methods inherited from <a href="irssi.html#Server">Server</a>:<br> +Methods inherited from <a href="irssi-python.html#Server">Server</a>:<br> <dl><dt><a name="IrcServer-channel_find"><strong>channel_find</strong></a>(...)</dt><dd><tt><a href="#IrcServer-channel_find">channel_find</a>(name) -> <a href="#Channel">Channel</a> <a href="__builtin__.html#object">object</a> or None<br> <br> Find channel from this server</tt></dd></dl> @@ -1135,7 +1135,7 @@ Find window with level</tt></dd></dl> Find window item that matches best to given arguments</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#Server">Server</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#Server">Server</a>:<br> <dl><dt><strong>away_reason</strong> = <attribute 'away_reason' of 'irssi.Server' objects><dd><tt>Away reason message</tt></dl> <dl><dt><strong>banned</strong> = <attribute 'banned' of 'irssi.Server' objects><dd><tt>Were we banned from this server? 1|0</tt></dl> @@ -1167,7 +1167,7 @@ Data and other attributes inherited from <a href="irssi.html#Server">Server</a>: <dl><dt><strong>version</strong> = <attribute 'version' of 'irssi.Server' objects><dd><tt><a href="#Server">Server</a> version</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#IrcServer-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -1175,7 +1175,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -1204,14 +1204,14 @@ Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBas <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="IrssiChatBase">class <strong>IrssiChatBase</strong></a>(<a href="irssi.html#IrssiBase">IrssiBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="IrssiChatBase">class <strong>IrssiChatBase</strong></a>(<a href="irssi-python.html#IrssiBase">IrssiBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyIrssiChatBase objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -1223,7 +1223,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -1416,15 +1416,15 @@ Data and other attributes defined here:<br> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Nick">class <strong>Nick</strong></a>(<a href="irssi.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Nick">class <strong>Nick</strong></a>(<a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyNick objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Nick">Nick</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Nick">Nick</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -1452,7 +1452,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>voice</strong> = <attribute 'voice' of 'irssi.Nick' objects><dd><tt>User status</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Nick-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -1460,7 +1460,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -1529,16 +1529,16 @@ Data and other attributes defined here:<br> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Query">class <strong>Query</strong></a>(<a href="irssi.html#WindowItem">WindowItem</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Query">class <strong>Query</strong></a>(<a href="irssi-python.html#WindowItem">WindowItem</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyQuery objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Query">Query</a></dd> -<dd><a href="irssi.html#WindowItem">WindowItem</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Query">Query</a></dd> +<dd><a href="irssi-python.html#WindowItem">WindowItem</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -1556,7 +1556,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>unwanted</strong> = <attribute 'unwanted' of 'irssi.Query' objects><dd><tt>1 if the other side closed or some error occured (DCC chats)</tt></dl> <hr> -Methods inherited from <a href="irssi.html#WindowItem">WindowItem</a>:<br> +Methods inherited from <a href="irssi-python.html#WindowItem">WindowItem</a>:<br> <dl><dt><a name="Query-activity"><strong>activity</strong></a>(...)</dt><dd><tt><a href="#Query-activity">activity</a>(data_level, hilight_color) -> None</tt></dd></dl> <dl><dt><a name="Query-command"><strong>command</strong></a>(...)</dt><dd><tt><a href="#Query-command">command</a>(cmd) -> None<br> @@ -1594,7 +1594,7 @@ Set window item active</tt></dd></dl> Return parent window for window item</tt></dd></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#WindowItem">WindowItem</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#WindowItem">WindowItem</a>:<br> <dl><dt><strong>createtime</strong> = <attribute 'createtime' of 'irssi.WindowItem' objects><dd><tt>Time the witem was created</tt></dl> <dl><dt><strong>data_level</strong> = <attribute 'data_level' of 'irssi.WindowItem' objects><dd><tt>0=no new data, 1=text, 2=msg, 3=highlighted text</tt></dl> @@ -1606,7 +1606,7 @@ Data and other attributes inherited from <a href="irssi.html#WindowItem">WindowI <dl><dt><strong>server</strong> = <attribute 'server' of 'irssi.WindowItem' objects><dd><tt>Active name for item</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Query-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -1614,7 +1614,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -1800,15 +1800,15 @@ Data and other attributes defined here:<br> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Server">class <strong>Server</strong></a>(<a href="irssi.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Server">class <strong>Server</strong></a>(<a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyServer objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#Server">Server</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#Server">Server</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -1943,7 +1943,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>version</strong> = <attribute 'version' of 'irssi.Server' objects><dd><tt><a href="#Server">Server</a> version</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#Server-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -1951,7 +1951,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -2160,15 +2160,15 @@ Data and other attributes defined here:<br> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="WindowItem">class <strong>WindowItem</strong></a>(<a href="irssi.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="WindowItem">class <strong>WindowItem</strong></a>(<a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>PyWindowItem objects<br> </tt></td></tr> <tr><td> </td> <td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="irssi.html#WindowItem">WindowItem</a></dd> -<dd><a href="irssi.html#IrssiChatBase">IrssiChatBase</a></dd> -<dd><a href="irssi.html#IrssiBase">IrssiBase</a></dd> +<dd><a href="irssi-python.html#WindowItem">WindowItem</a></dd> +<dd><a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a></dd> +<dd><a href="irssi-python.html#IrssiBase">IrssiBase</a></dd> <dd><a href="__builtin__.html#object">__builtin__.object</a></dd> </dl> <hr> @@ -2226,7 +2226,7 @@ Data and other attributes defined here:<br> <dl><dt><strong>server</strong> = <attribute 'server' of 'irssi.WindowItem' objects><dd><tt>Active name for item</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">IrssiChatBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiChatBase">IrssiChatBase</a>:<br> <dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#WindowItem-__new__">__new__</a>(S, ...) -> a new <a href="__builtin__.html#object">object</a> with type S, a subtype of T</tt></dl> <dl><dt><strong>chat_type</strong> = <attribute 'chat_type' of 'irssi.IrssiChatBase' objects><dd><tt>Chat name (str)</tt></dl> @@ -2234,7 +2234,7 @@ Data and other attributes inherited from <a href="irssi.html#IrssiChatBase">Irss <dl><dt><strong>chat_type_id</strong> = <attribute 'chat_type_id' of 'irssi.IrssiChatBase' objects><dd><tt>Chat Type id (int)</tt></dl> <hr> -Data and other attributes inherited from <a href="irssi.html#IrssiBase">IrssiBase</a>:<br> +Data and other attributes inherited from <a href="irssi-python.html#IrssiBase">IrssiBase</a>:<br> <dl><dt><strong>type</strong> = <attribute 'type' of 'irssi.IrssiBase' objects><dd><tt>Irssi's name for <a href="__builtin__.html#object">object</a></tt></dl> <dl><dt><strong>type_id</strong> = <attribute 'type_id' of 'irssi.IrssiBase' objects><dd><tt>Irssi's type id for <a href="__builtin__.html#object">object</a></tt></dl> @@ -2591,4 +2591,4 @@ Return refnum for last window.</tt></dd></dl> <strong>SIGNAL_PRIORITY_DEFAULT</strong> = 0<br> <strong>SIGNAL_PRIORITY_HIGH</strong> = -100<br> <strong>SIGNAL_PRIORITY_LOW</strong> = 100</td></tr></table> -</body></html>
\ No newline at end of file +</body></html> diff --git a/src/Makefile.am b/src/Makefile.am index 5a28039..d5356a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,16 +1,16 @@ moduledir = $(libdir)/irssi/modules wrappersdir = $(datadir)/irssi/scripts -module_LTLIBRARIES = libirssi_python.la +module_LTLIBRARIES = libpython.la -libirssi_python_la_DEPENDENCIES = objects/libobjects.la -libirssi_python_la_LIBADD = $(PYTHON_LDFLAGS) objects/libobjects.la -libirssi_python_la_LDFLAGS = -avoid-version +libpython_la_DEPENDENCIES = objects/libobjects.la +libpython_la_LIBADD = $(PYTHON_LDFLAGS) objects/libobjects.la +libpython_la_LDFLAGS = -avoid-version INCLUDES = $(IRSSI_PYTHON_INCLUDES) \ -I$(top_srcdir)/src/objects \ -DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" -libirssi_python_la_SOURCES = \ +libpython_la_SOURCES = \ pycore.c \ pyutils.c \ pymodule.c \ diff --git a/src/pycore.c b/src/pycore.c index f367e5f..0003392 100644 --- a/src/pycore.c +++ b/src/pycore.c @@ -32,7 +32,14 @@ #include "pyconstants.h" #include "factory.h" -/*XXX: copy parse into utils */ +static void cmd_default(const char *data, SERVER_REC *server, void *item) +{ + if (!*data) + data = "list"; + + command_runsub("py", data, server, item); +} + static void cmd_exec(const char *data) { PyObject *co; @@ -136,7 +143,7 @@ static void intr_catch(int sig) } #endif -void irssi_python_init(void) +void python_init(void) { Py_InitializeEx(0); @@ -156,21 +163,23 @@ void irssi_python_init(void) "import irssi_startup\n" ); - //assert(signal(SIGINT, intr_catch) != SIG_ERR); + /* assert(signal(SIGINT, intr_catch) != SIG_ERR); */ - command_bind("pyload", NULL, (SIGNAL_FUNC) cmd_load); - command_bind("pyunload", NULL, (SIGNAL_FUNC) cmd_unload); - command_bind("pylist", NULL, (SIGNAL_FUNC) cmd_list); - command_bind("pyexec", NULL, (SIGNAL_FUNC) cmd_exec); + command_bind("py", NULL, (SIGNAL_FUNC) cmd_default); + command_bind("py load", NULL, (SIGNAL_FUNC) cmd_load); + command_bind("py unload", NULL, (SIGNAL_FUNC) cmd_unload); + command_bind("py list", NULL, (SIGNAL_FUNC) cmd_list); + command_bind("py exec", NULL, (SIGNAL_FUNC) cmd_exec); module_register(MODULE_NAME, "core"); } -void irssi_python_deinit(void) +void python_deinit(void) { - command_unbind("pyload", (SIGNAL_FUNC) cmd_load); - command_unbind("pyunload", (SIGNAL_FUNC) cmd_unload); - command_unbind("pylist", (SIGNAL_FUNC) cmd_list); - command_unbind("pyexec", (SIGNAL_FUNC) cmd_exec); + command_unbind("py", (SIGNAL_FUNC) cmd_default); + command_unbind("py load", (SIGNAL_FUNC) cmd_load); + command_unbind("py unload", (SIGNAL_FUNC) cmd_unload); + command_unbind("py list", (SIGNAL_FUNC) cmd_list); + command_unbind("py exec", (SIGNAL_FUNC) cmd_exec); pymodule_deinit(); pyloader_deinit(); diff --git a/src/pycore.h b/src/pycore.h index ae51924..f3f1c36 100644 --- a/src/pycore.h +++ b/src/pycore.h @@ -1,7 +1,7 @@ #ifndef _PYCORE_H #define _PYCORE_H -void irssi_python_init(void); -void irssi_python_deinit(void); +void python_init(void); +void python_deinit(void); #endif diff --git a/src/pyirssi.h b/src/pyirssi.h index 3fc4223..1db4dfd 100644 --- a/src/pyirssi.h +++ b/src/pyirssi.h @@ -1,7 +1,7 @@ #ifndef _PYIRSSI_H_ #define _PYIRSSI_H_ -#define MODULE_NAME "irssi_python" +#define MODULE_NAME "python" #include "config.h" #include "core.h" #include "common.h" |