diff options
author | Timo Sirainen <cras@irssi.org> | 2000-08-26 15:39:44 +0000 |
---|---|---|
committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-08-26 15:39:44 +0000 |
commit | e395e87dedd9aa85f05e5c74330a76f1ef700371 (patch) | |
tree | 1184487b13038499f1771e4c553222f85b8524d2 /src/perl/xs | |
parent | 3d124da13b8da5c0b535abfe6265fc471d9d2ebd (diff) | |
download | irssi-e395e87dedd9aa85f05e5c74330a76f1ef700371.zip |
Lots of moving stuff around - hopefully I didn't break too much :)
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@632 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/perl/xs')
-rw-r--r-- | src/perl/xs/Irssi-query.xs | 4 | ||||
-rw-r--r-- | src/perl/xs/Irssi-window.xs | 6 | ||||
-rw-r--r-- | src/perl/xs/module.h | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/perl/xs/Irssi-query.xs b/src/perl/xs/Irssi-query.xs index 95275dce..3f68a273 100644 --- a/src/perl/xs/Irssi-query.xs +++ b/src/perl/xs/Irssi-query.xs @@ -28,7 +28,7 @@ PPCODE: } Irssi::Query -query_create(server, nick, automatic) +irc_query_create(server, nick, automatic) Irssi::Server server char *nick int automatic @@ -56,7 +56,7 @@ PPCODE: stash = gv_stashpv("Irssi::Server", 0); hv_store(hv, "server", 6, sv_bless(newRV_noinc(newSViv(GPOINTER_TO_INT(query->server))), stash), 0); - hv_store(hv, "nick", 4, new_pv(query->nick), 0); + hv_store(hv, "name", 4, new_pv(query->name), 0); hv_store(hv, "new_data", 8, newSViv(query->new_data), 0); hv_store(hv, "address", 7, new_pv(query->address), 0); diff --git a/src/perl/xs/Irssi-window.xs b/src/perl/xs/Irssi-window.xs index f1766ffa..65382bbb 100644 --- a/src/perl/xs/Irssi-window.xs +++ b/src/perl/xs/Irssi-window.xs @@ -1,7 +1,7 @@ MODULE = Irssi PACKAGE = Irssi void -command(cmd, server=active_win->active_server, item=active_win->active) +command(cmd, server=IRC_SERVER(active_win->active_server), item=active_win->active) char *cmd Irssi::Server server Irssi::Windowitem item @@ -18,7 +18,7 @@ OUTPUT: Irssi::Server active_server() CODE: - RETVAL = active_win->active_server; + RETVAL = IRC_SERVER(active_win->active_server); OUTPUT: RETVAL @@ -47,7 +47,7 @@ command(server, cmd, item=active_win->active) Irssi::Server server Irssi::Windowitem item CODE: - if (item != NULL && item->server != server) + if (item != NULL && item->server != SERVER(server)) item = NULL; signal_emit("send command", 3, cmd, server, item); diff --git a/src/perl/xs/module.h b/src/perl/xs/module.h index bbb0a127..8f003fdc 100644 --- a/src/perl/xs/module.h +++ b/src/perl/xs/module.h @@ -6,20 +6,20 @@ #include "common.h" #include "network.h" #include "commands.h" -#include "server.h" +#include "servers.h" #include "log.h" #include "rawlog.h" #include "settings.h" +#include "masks.h" #include "irc/core/bans.h" -#include "irc/core/channels.h" -#include "irc/core/query.h" #include "irc/core/irc.h" -#include "irc/core/irc-server.h" +#include "irc/core/irc-servers.h" #include "irc/core/server-reconnect.h" #include "irc/core/server-setup.h" -#include "irc/core/nicklist.h" -#include "irc/core/masks.h" +#include "irc/core/irc-channels.h" +#include "irc/core/irc-queries.h" +#include "irc/core/irc-nicklist.h" #include "irc/core/modes.h" #include "irc/core/mode-lists.h" #include "irc/core/netsplit.h" @@ -37,7 +37,7 @@ typedef COMMAND_REC *Irssi__Command; typedef LOG_REC *Irssi__Log; typedef RAWLOG_REC *Irssi__Rawlog; -typedef CHANNEL_REC *Irssi__Channel; +typedef IRC_CHANNEL_REC *Irssi__Channel; typedef QUERY_REC *Irssi__Query; typedef IRC_SERVER_REC *Irssi__Server; typedef IRC_SERVER_CONNECT_REC *Irssi__Connect; |